Commit 243e0728 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

tmp

parent eeefef7b
...@@ -77,7 +77,7 @@ ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.2.0") # Eigen::Ref appeared from 3.2.0 ...@@ -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: # 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 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. # - 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") ADD_REQUIRED_DEPENDENCY("pinocchio >= 2.0.0")
......
...@@ -33,10 +33,10 @@ MACRO(ADD_TESTCASE NAME PKGS) ...@@ -33,10 +33,10 @@ MACRO(ADD_TESTCASE NAME PKGS)
ADD_UNIT_TEST(${NAME} ${NAME}) ADD_UNIT_TEST(${NAME} ${NAME})
SET_TARGET_PROPERTIES(${NAME} PROPERTIES LINKER_LANGUAGE CXX) 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") SET(MODULE_NAME "${NAME}Test")
STRING(REGEX REPLACE "-" "_" MODULE_NAME ${MODULE_NAME}) 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}) FOREACH(PKG ${PKGS})
PKG_CONFIG_USE_DEPENDENCY(${NAME} ${PKG}) PKG_CONFIG_USE_DEPENDENCY(${NAME} ${PKG})
...@@ -62,8 +62,8 @@ ADD_TEST_CFLAGS(tasks '-DTSID_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"') ...@@ -62,8 +62,8 @@ ADD_TEST_CFLAGS(tasks '-DTSID_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"')
ADD_TESTCASE(contacts "eigen3;pinocchio") ADD_TESTCASE(contacts "eigen3;pinocchio")
ADD_TEST_CFLAGS(contacts '-DTSID_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"') ADD_TEST_CFLAGS(contacts '-DTSID_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"')
ADD_TESTCASE(tsid-formulation "eigen3;pinocchio") #ADD_TESTCASE(tsid-formulation "eigen3;pinocchio")
ADD_TEST_CFLAGS(tsid-formulation '-DTSID_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"') #ADD_TEST_CFLAGS(tsid-formulation '-DTSID_SOURCE_DIR=\\\"${${PROJECT_NAME}_SOURCE_DIR}\\\"')
ADD_TESTCASE(math_utils "eigen3;pinocchio") ADD_TESTCASE(math_utils "eigen3;pinocchio")
ADD_TESTCASE(hqp_solvers "eigen3;pinocchio") ADD_TESTCASE(hqp_solvers "eigen3;pinocchio")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment