From 243e072862726858fa24a2506e0b6deb50a35bcf Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 15 May 2019 09:05:55 +0200 Subject: [PATCH] tmp --- CMakeLists.txt | 2 +- unittest/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41adbb7d..a55cbd18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.2.0") # Eigen::Ref appeared from 3.2.0 # Fail-safe support for catkin-ized pinocchio: # - If catkin-based pinocchio is installed it runs the CFG_EXTRAS to set up the Pinocchio preprocessor directives # - If it isn't, nothing happens and the subsequent pkg-config check takes care of everything. -#find_package(catkin QUIET COMPONENTS pinocchio) +find_package(catkin QUIET COMPONENTS pinocchio) ADD_REQUIRED_DEPENDENCY("pinocchio >= 2.0.0") diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 2501be61..6b36fd7f 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -33,10 +33,10 @@ MACRO(ADD_TESTCASE NAME PKGS) ADD_UNIT_TEST(${NAME} ${NAME}) SET_TARGET_PROPERTIES(${NAME} PROPERTIES LINKER_LANGUAGE CXX) - ADD_TEST_CFLAGS(${NAME} "-DBOOST_TEST_DYN_LINK") + ADD_TEST_CFLAGS(${NAME} "-DBOOST_TEST_DYN_LINK") SET(MODULE_NAME "${NAME}Test") STRING(REGEX REPLACE "-" "_" MODULE_NAME ${MODULE_NAME}) - ADD_TEST_CFLAGS(${NAME} "-DBOOST_TEST_MODULE=${MODULE_NAME}") + ADD_TEST_CFLAGS(${NAME} "-DBOOST_TEST_MODULE=${MODULE_NAME}") FOREACH(PKG ${PKGS}) PKG_CONFIG_USE_DEPENDENCY(${NAME} ${PKG}) @@ -62,8 +62,8 @@ ADD_TEST_CFLAGS(tasks '-DTSID_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"') ADD_TESTCASE(contacts "eigen3;pinocchio") ADD_TEST_CFLAGS(contacts '-DTSID_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"') -ADD_TESTCASE(tsid-formulation "eigen3;pinocchio") -ADD_TEST_CFLAGS(tsid-formulation '-DTSID_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"') +#ADD_TESTCASE(tsid-formulation "eigen3;pinocchio") +#ADD_TEST_CFLAGS(tsid-formulation '-DTSID_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"') ADD_TESTCASE(math_utils "eigen3;pinocchio") ADD_TESTCASE(hqp_solvers "eigen3;pinocchio")