From 66de1e7069b95bf40682a5af45bfa07b911a2b67 Mon Sep 17 00:00:00 2001 From: cbeall3 Date: Thu, 12 Feb 2015 15:42:53 -0500 Subject: [PATCH 1/4] add custom all.tests target to build all tests without running them, and remove obsolete testing macros --- cmake/GtsamTesting.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/GtsamTesting.cmake b/cmake/GtsamTesting.cmake index 2e505c11e..4b3af9810 100644 --- a/cmake/GtsamTesting.cmake +++ b/cmake/GtsamTesting.cmake @@ -109,9 +109,8 @@ add_custom_target(examples) # Add timing target add_custom_target(timing) -# Include obsolete macros - will be removed in the near future -include(GtsamTestingObsolete) - +# Add target to build tests without running +add_custom_target(all.tests) # Implementations of this file's macros: @@ -165,6 +164,7 @@ macro(gtsamAddTestsGlob_impl groupName globPatterns excludedFiles linkLibraries) add_test(NAME ${script_name} COMMAND ${script_name}) add_dependencies(check.${groupName} ${script_name}) add_dependencies(check ${script_name}) + add_dependencies(all.tests ${script_name}) if(NOT MSVC AND NOT XCODE_VERSION) add_custom_target(${script_name}.run ${EXECUTABLE_OUTPUT_PATH}${script_name}) endif() @@ -195,6 +195,7 @@ macro(gtsamAddTestsGlob_impl groupName globPatterns excludedFiles linkLibraries) add_test(NAME ${target_name} COMMAND ${target_name}) add_dependencies(check.${groupName} ${target_name}) add_dependencies(check ${target_name}) + add_dependencies(all.tests ${script_name}) # Add TOPSRCDIR set_property(SOURCE ${script_srcs} APPEND PROPERTY COMPILE_DEFINITIONS "TOPSRCDIR=\"${PROJECT_SOURCE_DIR}\"") From bda7ce9f97d9689437638c8fd64abc7f25288960 Mon Sep 17 00:00:00 2001 From: cbeall3 Date: Thu, 12 Feb 2015 15:43:12 -0500 Subject: [PATCH 2/4] Move obsolete testing macros --- cmake/{ => obsolete}/GtsamTestingObsolete.cmake | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename cmake/{ => obsolete}/GtsamTestingObsolete.cmake (100%) diff --git a/cmake/GtsamTestingObsolete.cmake b/cmake/obsolete/GtsamTestingObsolete.cmake similarity index 100% rename from cmake/GtsamTestingObsolete.cmake rename to cmake/obsolete/GtsamTestingObsolete.cmake From f2c3826a4056f77650746690f47a10e0cbb6fe01 Mon Sep 17 00:00:00 2001 From: cbeall3 Date: Thu, 12 Feb 2015 15:43:53 -0500 Subject: [PATCH 3/4] print out Rot3 expmap configuration flag in summary --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0888a394e..38ee89760 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -424,6 +424,7 @@ message(STATUS " CPack Generator : ${CPACK_GENERATOR}") message(STATUS "GTSAM flags ") print_config_flag(${GTSAM_USE_QUATERNIONS} "Quaternions as default Rot3 ") print_config_flag(${GTSAM_ENABLE_CONSISTENCY_CHECKS} "Runtime consistency checking ") +print_config_flag(${GTSAM_ROT3_EXPMAP} "Rot3 retract is full ExpMap ") print_config_flag(${GTSAM_POSE3_EXPMAP} "Pose3 retract is full ExpMap ") message(STATUS "MATLAB toolbox flags ") From 1c023e68aefec11d8e34e7bbe8ca1f67eb5e5a1f Mon Sep 17 00:00:00 2001 From: cbeall3 Date: Thu, 12 Feb 2015 15:53:18 -0500 Subject: [PATCH 4/4] Remove obsolete test macro file from install --- cmake/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 49069c57f..a6860f205 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -19,7 +19,6 @@ install(FILES GtsamMatlabWrap.cmake GtsamPythonWrap.cmake GtsamTesting.cmake - GtsamTestingObsolete.cmake README.html DESTINATION "${SCRIPT_INSTALL_DIR}/GTSAMCMakeTools")