Fix static builds and optimize test compilation #1343
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,10 +5,9 @@ ign_get_libsources_and_unittests(sources gtest_sources) | |
| # Add the source file auto-generated into the build folder from sdf/CMakeLists.txt | ||
| list(APPEND sources EmbeddedSdf.cc) | ||
|
|
||
| # When using the internal URDF parser, we build its sources with the core library | ||
| if (USE_INTERNAL_URDF) | ||
| set(urdf_internal_sources | ||
| urdf/urdf_parser/model.cpp | ||
| urdf/urdf_parser/link.cpp | ||
| urdf/urdf_parser/joint.cpp | ||
|
|
@@ -17,59 +16,48 @@ if (USE_INTERNAL_URDF) | |
| urdf/urdf_parser/urdf_model_state.cpp | ||
| urdf/urdf_parser/urdf_sensor.cpp | ||
| urdf/urdf_parser/world.cpp) | ||
| set(sources ${sources} ${urdf_internal_sources}) | ||
| endif() | ||
|
|
||
| ign_create_core_library(SOURCES ${sources} | ||
| CXX_STANDARD 17 | ||
| LEGACY_PROJECT_PREFIX SDFormat | ||
| ) | ||
|
|
||
| target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} | ||
| PUBLIC | ||
| ignition-math${IGN_MATH_VER}::ignition-math${IGN_MATH_VER} | ||
| ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER} | ||
| PRIVATE | ||
| TINYXML2::TINYXML2) | ||
|
|
||
| if (USE_INTERNAL_URDF) | ||
| target_include_directories(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/urdf) | ||
| if (WIN32) | ||
| target_compile_definitions(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE -D_USE_MATH_DEFINES) | ||
| endif() | ||
| else() | ||
| target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE | ||
| IgnURDFDOM::IgnURDFDOM) | ||
| endif() | ||
|
|
||
| if (WIN32 AND USE_INTERNAL_URDF) | ||
| target_compile_definitions(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE URDFDOM_STATIC) | ||
| endif() | ||
|
|
||
| target_include_directories(${PROJECT_LIBRARY_TARGET_NAME} | ||
| PRIVATE | ||
| ${CMAKE_CURRENT_SOURCE_DIR} | ||
| ) | ||
|
|
||
| if (BUILD_TESTING) | ||
| # Build this test file only if Ignition Tools is installed. | ||
| if (NOT IGN_PROGRAM) | ||
| list(REMOVE_ITEM gtest_sources ign_TEST.cc) | ||
| endif() | ||
|
|
||
| add_library(library_for_tests OBJECT | ||
| Converter.cc | ||
| EmbeddedSdf.cc | ||
| FrameSemantics.cc | ||
|
|
@@ -78,53 +66,45 @@ if (BUILD_TESTING) | |
| Utils.cc | ||
| XmlUtils.cc | ||
| parser.cc | ||
| parser_urdf.cc | ||
| ) | ||
|
|
||
| if (USE_INTERNAL_URDF) | ||
| target_sources(library_for_tests PRIVATE ${urdf_internal_sources}) | ||
| endif() | ||
|
|
||
| # Link against the publically and privately linked libraries of the core library | ||
| target_link_libraries(library_for_tests | ||
| $<TARGET_PROPERTY:${PROJECT_LIBRARY_TARGET_NAME},LINK_LIBRARIES> | ||
| ) | ||
|
|
||
| # Use the include flags from the core library | ||
| target_include_directories(library_for_tests PUBLIC | ||
| $<TARGET_PROPERTY:${PROJECT_LIBRARY_TARGET_NAME},INCLUDE_DIRECTORIES> | ||
| ) | ||
|
|
||
| # Use the private compile flags from the core library. Also set IGNITION_SDFORMAT_STATIC_DEFINE to avoid | ||
| # inconsistent linkage issues on windows. Setting the define will cause the SDFORMAT_VISIBLE/SDFORMAT_HIDDEN macros | ||
| # to expand to nothing when building a static library | ||
| target_compile_definitions(library_for_tests PUBLIC | ||
| $<TARGET_PROPERTY:${PROJECT_LIBRARY_TARGET_NAME},COMPILE_DEFINITIONS> | ||
| -DIGNITION_SDFORMAT_STATIC_DEFINE | ||
| ) | ||
|
|
||
| ign_build_tests( | ||
| TYPE UNIT | ||
| SOURCES ${gtest_sources} | ||
| INCLUDE_DIRS | ||
| ${CMAKE_CURRENT_SOURCE_DIR} | ||
| ${PROJECT_SOURCE_DIR}/test | ||
| LIB_DEPS | ||
| library_for_tests | ||
| TEST_LIST | ||
| test_targets | ||
|
There was a problem hiding this comment. nit: I don't think There was a problem hiding this comment. oops. I saw this right after I merged. See #1347. |
||
| ) | ||
|
|
||
| endif() | ||
|
|
||
| if(NOT WIN32) | ||
| add_subdirectory(cmd) | ||
| endif() | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: spelling