From 74c9de2cd6a8dbcdf75780ce9f845c9f670a413f Mon Sep 17 00:00:00 2001 From: mnaveau <maximilien.naveau@laas.fr> Date: Thu, 28 Apr 2016 16:40:34 +0200 Subject: [PATCH] debug the use of the private_config.hh.cmake --- private_cmake/config_private.hh.cmake | 3 --- tests/CMakeLists.txt | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/private_cmake/config_private.hh.cmake b/private_cmake/config_private.hh.cmake index 50b01f39..ec44afa2 100644 --- a/private_cmake/config_private.hh.cmake +++ b/private_cmake/config_private.hh.cmake @@ -19,7 +19,4 @@ // Package version (header). # define JRL_WALKGEN_CONFIG_VERSION "@PROJECT_VERSION@" -#if @WITH_HRP2_DYNAMICS_BOOL@ //! WITH_HRP2_DYNAMICS? -# define WITH_HRP2DYNAMICS -#endif //! WITH_HRP2_DYNAMICS? #endif //! JRL_WALKGEN_CONFIG_PRIVATE_HH diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c354a7b5..3938f82e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -22,6 +22,10 @@ LINK_DIRECTORIES(${JRL_DYNAMICS_LIBRARY_DIRS}) # Make sure private headers can be used. INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src) +# Make the config_private.hh file available +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/private_cmake/config_private.hh.cmake + ${CMAKE_BINARY_DIR}/include/${HEADER_DIR}/config_private.hh) + ################# ## Generic test # ################# @@ -82,7 +86,7 @@ ADD_TEST(TestRiccatiEquation TestRiccatiEquation) ## CONFIG_FILES_CMAKE(TestMorisawa2007WalkingOnBeam${BITS}TestFGPI.datref) ## CONFIG_FILES_CMAKE(TestMorisawa2007GoThroughWall${BITS}TestFGPI.datref) -# CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/private_cmake/config_private.hh.cmake ${CMAKE_BINARY_DIR}/include/${HEADER_DIR}/config_private.hh) +# # MACRO(ADD_MORISAWA_2007 test_morisawa_arg) -- GitLab