From 7ac7d931aa69d42651e37bd244698d312a2be385 Mon Sep 17 00:00:00 2001 From: Joseph Mirabel <jmirabel@laas.fr> Date: Fri, 25 Jul 2014 21:16:19 +0200 Subject: [PATCH] Update CMakeLists.txt --- CMakeLists.txt | 3 +++ src/CMakeLists.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62444d9b..9333afdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(CXX_DISABLE_WERROR TRUE) INCLUDE(cmake/base.cmake) +INCLUDE(cmake/boost.cmake) SET(PROJECT_NAME hpp-manipulation) SET(PROJECT_URL "") @@ -34,6 +35,7 @@ IF (HPP_DEBUG) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHPP_DEBUG") ENDIF() +SEARCH_FOR_BOOST() ADD_DOC_DEPENDENCY(hpp-model >= 3.0.0) ADD_REQUIRED_DEPENDENCY(hpp-core >= 3.0.0) ADD_REQUIRED_DEPENDENCY(hpp-constraints >= 3.0.0) @@ -57,5 +59,6 @@ SET (${PROJECT_NAME}_HEADERS PKG_CONFIG_APPEND_LIBS("hpp-manipulation") ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(tests) SETUP_PROJECT_FINALIZE() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 286b86d7..51e4b199 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,5 +33,6 @@ ADD_LIBRARY(${LIBRARY_NAME} SHARED ) PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-core) +PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-constraints) INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib) -- GitLab