From 58b64da52522fcda44c402e3f119181f3f959618 Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Wed, 29 Feb 2012 04:11:48 +0000 Subject: [PATCH] Added better printout of configurable cmake options at the end of configuration --- .cproject | 311 ++++++++++++++++++++------------------ CMakeLists.txt | 33 +++- cmake/GtsamPrinting.cmake | 10 ++ wrap/CMakeLists.txt | 5 - 4 files changed, 200 insertions(+), 159 deletions(-) create mode 100644 cmake/GtsamPrinting.cmake diff --git a/.cproject b/.cproject index 51ed912d7..09812db7d 100644 --- a/.cproject +++ b/.cproject @@ -311,6 +311,14 @@ true true + + make + -j2 + testGaussianFactor.run + true + true + true + make -j2 @@ -337,7 +345,6 @@ make - tests/testBayesTree.run true false @@ -345,7 +352,6 @@ make - testBinaryBayesNet.run true false @@ -393,7 +399,6 @@ make - testSymbolicBayesNet.run true false @@ -401,7 +406,6 @@ make - tests/testSymbolicFactor.run true false @@ -409,7 +413,6 @@ make - testSymbolicFactorGraph.run true false @@ -425,20 +428,11 @@ make - tests/testBayesTree true false true - - make - -j2 - testGaussianFactor.run - true - true - true - make -j2 @@ -465,6 +459,7 @@ make + testGraph.run true false @@ -536,6 +531,7 @@ make + testInference.run true false @@ -543,6 +539,7 @@ make + testGaussianFactor.run true false @@ -550,6 +547,7 @@ make + testJunctionTree.run true false @@ -557,6 +555,7 @@ make + testSymbolicBayesNet.run true false @@ -564,6 +563,7 @@ make + testSymbolicFactorGraph.run true false @@ -633,22 +633,6 @@ false true - - make - -j2 - tests/testPose2.run - true - true - true - - - make - -j2 - tests/testPose3.run - true - true - true - make -j2 @@ -665,6 +649,22 @@ true true + + make + -j2 + tests/testPose2.run + true + true + true + + + make + -j2 + tests/testPose3.run + true + true + true + make -j2 @@ -689,26 +689,26 @@ true true - + make - -j2 - all + -j2 VERBOSE=1 + check.nonlinear + true + false + true + + + make + -j5 + timing.nonlinear true true true - + make - -j2 - check - true - true - true - - - make - -j2 - clean + -j5 + nonlinear.testValues.run true true true @@ -761,26 +761,26 @@ true true - + make - -j2 VERBOSE=1 - check.nonlinear - true - false - true - - - make - -j5 - timing.nonlinear + -j2 + all true true true - + make - -j5 - nonlinear.testValues.run + -j2 + check + true + true + true + + + make + -j2 + clean true true true @@ -1131,7 +1131,6 @@ make - testErrors.run true false @@ -1611,6 +1610,7 @@ make + testSimulated2DOriented.run true false @@ -1650,6 +1650,7 @@ make + testSimulated2D.run true false @@ -1657,6 +1658,7 @@ make + testSimulated3D.run true false @@ -1830,6 +1832,14 @@ true true + + make + -j5 + linear.testSerializationLinear.run + true + true + true + make -j2 @@ -1920,6 +1930,7 @@ make + tests/testGaussianISAM2 true false @@ -1941,77 +1952,6 @@ true true - - make - -j2 - install - true - true - true - - - make - -j2 - clean - true - true - true - - - make - -j2 - check - true - true - true - - - make - -j2 - all - true - true - true - - - cmake - .. - true - false - true - - - make - -j5 - gtsam-shared - true - true - true - - - make - -j5 - gtsam-static - true - true - true - - - make - -j5 - timing - true - true - true - - - make - -j5 - examples - true - true - true - make -j2 @@ -2108,23 +2048,7 @@ true true - - make - -j2 - check - true - true - true - - - make - -j2 - clean - true - true - true - - + make -j2 install @@ -2132,21 +2056,69 @@ true true - + make -j2 - all + clean true true true - + + make + -j2 + check + true + true + true + + + make + -j5 VERBOSE=1 + all + true + false + true + + cmake .. true false true + + make + -j5 + gtsam-shared + true + true + true + + + make + -j5 + gtsam-static + true + true + true + + + make + -j5 + timing + true + true + true + + + make + -j5 + examples + true + true + true + make -j5 @@ -2187,6 +2159,45 @@ true true + + make + -j2 + check + true + true + true + + + make + -j2 + clean + true + true + true + + + make + -j2 + install + true + true + true + + + make + -j2 + all + true + true + true + + + cmake + .. + true + false + true + diff --git a/CMakeLists.txt b/CMakeLists.txt index 031b9f96c..075f55094 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,11 @@ set (GTSAM_VERSION_PATCH 3) # Set the default install path to home set (CMAKE_INSTALL_PREFIX ${HOME} CACHE DOCSTRING "Install prefix for library") +# Use macros for creating tests/timing scripts +set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) +include(GtsamTesting) +include(GtsamPrinting) + # guard against in-source builds if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) message(FATAL_ERROR "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there. You may need to remove CMakeCache.txt. ") @@ -41,6 +46,10 @@ option(GTSAM_BUILD_EXAMPLES "Enable/Disable building of examples" ON) option(GTSAM_BUILD_WRAP "Enable/Disable building of matlab wrap utility (necessary for matlab interface)" ON) option(GTSAM_USE_QUATERNIONS "Enable/Disable using an internal Quaternion representation for rotations instead of rotation matrices" OFF) option(GTSAM_BUILD_CONVENIENCE_LIBRARIES "Enable/Disable use of convenience libraries for faster development rebuilds, but slower install" ON) +option(GTSAM_INSTALL_MATLAB_TOOLBOX "Enable/Disable installation of matlab toolbox" ON) +option(GTSAM_INSTALL_MATLAB_EXAMPLES "Enable/Disable installation of matlab examples" ON) +option(GTSAM_INSTALL_MATLAB_TESTS "Enable/Disable installation of matlab tests" ON) +option(GTSAM_INSTALL_WRAP "Enable/Disable installation of wrap utility" ON) # Add the Quaternion Build Flag if requested if (GTSAM_USE_QUATERNIONS) @@ -59,10 +68,6 @@ if (GTSAM_BUILD_TESTS) include(CTest) endif() -# Use macros for creating tests/timing scripts -set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) -include(GtsamTesting) - # Enable make check (http://www.cmake.org/Wiki/CMakeEmulateMakeCheck) add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) add_custom_target(timing) @@ -98,6 +103,26 @@ if (GTSAM_BUILD_EXAMPLES) add_subdirectory(examples) endif(GTSAM_BUILD_EXAMPLES) +# print configuration variables +message(STATUS "===============================================================") +message(STATUS "================ Configuration Options ======================") +message(STATUS "Build flags ") +print_config_flag(${GTSAM_BUILD_TIMING} "Build Timing scripts ") +print_config_flag(${GTSAM_BUILD_EXAMPLES} "Build Examples ") +print_config_flag(${GTSAM_BUILD_TESTS} "Build Tests ") +print_config_flag(${GTSAM_BUILD_WRAP} "Build Wrap ") +print_config_flag(${GTSAM_BUILD_CONVENIENCE_LIBRARIES} "Build Convenience Libraries") + +message(STATUS "GTSAM flags ") +print_config_flag(${GTSAM_USE_QUATERNIONS} "Quaternions as default Rot3") + +message(STATUS "MATLAB toolbox flags ") +print_config_flag(${GTSAM_INSTALL_MATLAB_TOOLBOX} "Install matlab toolbox ") +print_config_flag(${GTSAM_INSTALL_MATLAB_EXAMPLES} "Install matlab examples ") +print_config_flag(${GTSAM_INSTALL_MATLAB_TESTS} "Install matlab tests ") +print_config_flag(${GTSAM_INSTALL_WRAP} "Install wrap utility ") +message(STATUS "===============================================================") + # Set up CPack set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GTSAM") set(CPACK_PACKAGE_VENDOR "Frank Dellaert, Georgia Institute of Technology") diff --git a/cmake/GtsamPrinting.cmake b/cmake/GtsamPrinting.cmake new file mode 100644 index 000000000..b6f3ca4ef --- /dev/null +++ b/cmake/GtsamPrinting.cmake @@ -0,0 +1,10 @@ +# print configuration variables +# Usage: +#print_config_flag(${GTSAM_BUILD_TESTS} "Build Tests ") +macro(print_config_flag flag msg) + if ("${flag}" STREQUAL "ON") + message(STATUS " ${msg}: Enabled") + else ("${flag}" STREQUAL "ON") + message(STATUS " ${msg}: Disabled") + endif ("${flag}" STREQUAL "ON") +endmacro(print_config_flag) \ No newline at end of file diff --git a/wrap/CMakeLists.txt b/wrap/CMakeLists.txt index 79ef4bfe3..21f39fdb5 100644 --- a/wrap/CMakeLists.txt +++ b/wrap/CMakeLists.txt @@ -8,7 +8,6 @@ add_executable(wrap wrap.cpp) target_link_libraries(wrap wrap_lib) # Install wrap binary -option(GTSAM_INSTALL_WRAP "Enable/Disable installation of wrap utility" ON) if (GTSAM_INSTALL_WRAP) install(TARGETS wrap DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) endif(GTSAM_INSTALL_WRAP) @@ -42,10 +41,6 @@ add_custom_target(wrap_gtsam ALL COMMAND ./wrap ${GTSAM_MEX_BIN_EXTENSION} ${CMAKE_SOURCE_DIR} ${moduleName} ${toolbox_path} "${mexFlags}" DEPENDS wrap) -option(GTSAM_INSTALL_MATLAB_TOOLBOX "Enable/Disable installation of matlab toolbox" ON) -option(GTSAM_INSTALL_MATLAB_EXAMPLES "Enable/Disable installation of matlab examples" ON) -option(GTSAM_INSTALL_MATLAB_TESTS "Enable/Disable installation of matlab tests" ON) - set(GTSAM_TOOLBOX_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/borg/toolbox CACHE DOCSTRING "Path to install matlab toolbox") if (GTSAM_INSTALL_MATLAB_TOOLBOX)