From d1395c0e1d4b0360b28212d4bb1d1b045bcd3010 Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Mon, 25 Nov 2019 23:39:16 +0100
Subject: [PATCH] CMakeLists.txt switch to CMake Boost detection.
---
CMakeLists.txt | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd878c6..fdfb6e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,10 +26,11 @@ PROJECT(${PROJECT_NAME}
# jrl-cmakemodules handling of usual modules
INCLUDE(cmake/header.cmake)
-INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/pthread.cmake)
add_project_dependency(Eigen3 REQUIRED NO_MODULE)
-
+add_project_dependency(Boost REQUIRED
+ OPTIONAL_COMPONENTS
+ serialization system unit_test_framework thread)
# Allows math in mathjax.
SET(DOXYGEN_USE_MATHJAX YES)
@@ -59,13 +60,7 @@ SET(PKG_CONFIG_EXTRA "plugindir=${PLUGINDIR}")
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
# Search for Boost.
-SET(BOOST_COMPONENTS serialization system unit_test_framework thread)
-SEARCH_FOR_BOOST()
SEARCH_FOR_PTHREAD()
-#SEARCH_FOR_EIGEN()
-#find_package(catkin
-# REQUIRED COMPONENTS
-# )
####################################
@@ -212,7 +207,9 @@ FOREACH(plugin_file ${plugins_list})
PREFIX ""
)
- INSTALL(TARGETS ${plugin} EXPORT ${TARGET_NAME} DESTINATION ${PLUGINDIR})
+ INSTALL(TARGETS ${plugin}
+ EXPORT ${TARGET_NAME}
+ DESTINATION ${PLUGINDIR})
ENDFOREACH(plugin_file)
ADD_SUBDIRECTORY(include/${PROJECT_NAME})
@@ -220,3 +217,11 @@ ADD_SUBDIRECTORY(tests)
SETUP_PROJECT_PACKAGE_FINALIZE()
+
+get_cmake_property(_variableNames VARIABLES)
+list (SORT _variableNames)
+foreach (_variableName ${_variableNames})
+ message(STATUS "${_variableName}=${${_variableName}}")
+endforeach()
+
+MESSAGE(STATUS "dynamic_graph_VERSION=${dynamic_graph_VERSION}")
--
GitLab