Skip to content

Commit d1395c0

Browse files
olivier-stasseOlivier Stasse
authored andcommitted
CMakeLists.txt switch to CMake Boost detection.
1 parent 8b2530b commit d1395c0

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

CMakeLists.txt

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ PROJECT(${PROJECT_NAME}
2626

2727
# jrl-cmakemodules handling of usual modules
2828
INCLUDE(cmake/header.cmake)
29-
INCLUDE(cmake/boost.cmake)
3029
INCLUDE(cmake/pthread.cmake)
3130
add_project_dependency(Eigen3 REQUIRED NO_MODULE)
32-
31+
add_project_dependency(Boost REQUIRED
32+
OPTIONAL_COMPONENTS
33+
serialization system unit_test_framework thread)
3334
# Allows math in mathjax.
3435
SET(DOXYGEN_USE_MATHJAX YES)
3536

@@ -59,13 +60,7 @@ SET(PKG_CONFIG_EXTRA "plugindir=${PLUGINDIR}")
5960
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
6061

6162
# Search for Boost.
62-
SET(BOOST_COMPONENTS serialization system unit_test_framework thread)
63-
SEARCH_FOR_BOOST()
6463
SEARCH_FOR_PTHREAD()
65-
#SEARCH_FOR_EIGEN()
66-
#find_package(catkin
67-
# REQUIRED COMPONENTS
68-
# )
6964

7065

7166
####################################
@@ -212,11 +207,21 @@ FOREACH(plugin_file ${plugins_list})
212207
PREFIX ""
213208
)
214209
215-
INSTALL(TARGETS ${plugin} EXPORT ${TARGET_NAME} DESTINATION ${PLUGINDIR})
210+
INSTALL(TARGETS ${plugin}
211+
EXPORT ${TARGET_NAME}
212+
DESTINATION ${PLUGINDIR})
216213
ENDFOREACH(plugin_file)
217214
218215
ADD_SUBDIRECTORY(include/${PROJECT_NAME})
219216
ADD_SUBDIRECTORY(tests)
220217
221218
222219
SETUP_PROJECT_PACKAGE_FINALIZE()
220+
221+
get_cmake_property(_variableNames VARIABLES)
222+
list (SORT _variableNames)
223+
foreach (_variableName ${_variableNames})
224+
message(STATUS "${_variableName}=${${_variableName}}")
225+
endforeach()
226+
227+
MESSAGE(STATUS "dynamic_graph_VERSION=${dynamic_graph_VERSION}")

0 commit comments

Comments
 (0)