From afa9e0073b0d4fa7487e22938b9cba7575de389f Mon Sep 17 00:00:00 2001 From: jcarpent <jcarpent@laas.fr> Date: Wed, 21 Sep 2016 10:53:19 +0200 Subject: [PATCH] [CMake] Make eigenpy a separate dependency --- CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 933f7f3b8..a57a215bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,16 @@ IF(APPLE) endif("${isSystemDir}" STREQUAL "-1") ENDIF(APPLE) +# This should go to jrl-cmakemodules if accepted - Similar to ADD_DOC_DEPENDENC but with a requiered option +# This macro is for requiered components which must not appear as a dependence of the main library +MACRO(ADD_SEPARATE_DEPENDENCY PKG_CONFIG_STRING) + SET(PKG_CONFIG_DEBUG_STRING "") + FOREACH(ARG ${ARGN}) + SET(PKG_CONFIG_DEBUG_STRING ${ARG}) + ENDFOREACH() + ADD_DEPENDENCY(0 1 ${PKG_CONFIG_STRING} "${PKG_CONFIG_DEBUG_STRING}") +ENDMACRO(ADD_SEPARATE_DEPENDENCY) + # Disable -Werror on Unix for now. SET(CXX_DISABLE_WERROR True) SET(CMAKE_VERBOSE_MAKEFILE True) @@ -102,8 +112,8 @@ ENDIF(URDFDOM_FOUND) SET(BOOST_COMPONENTS filesystem unit_test_framework system) IF(BUILD_PYTHON_INTERFACE) - ADD_REQUIRED_DEPENDENCY("eigenpy >= 1.3.0") SET(BOOST_COMPONENTS ${BOOST_COMPONENTS} python) + ADD_SEPARATE_DEPENDENCY("eigenpy >= 1.3.0") FINDPYTHON(2.7 EXACT REQUIRED) INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS}) ENDIF(BUILD_PYTHON_INTERFACE) -- GitLab