Skip to content

Commit 675d7e3

Browse files
committed
[CMake] Boost: use only components
1 parent cdfd654 commit 675d7e3

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE)
3131
INCLUDE(cmake/pthread.cmake) # needs to be included after the CXX definition
3232

3333
# Project dependencies
34-
FIND_PACKAGE(Boost REQUIRED COMPONENTS unit_test_framework)
34+
IF(BUILD_TESTING)
35+
FIND_PACKAGE(Boost REQUIRED COMPONENTS unit_test_framework)
36+
ENDIF()
3537
ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS serialization system thread)
3638
ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED PKG_CONFIG_REQUIRES eigen3)
3739
SEARCH_FOR_PTHREAD()
@@ -126,10 +128,9 @@ SET(${PROJECT_NAME}_SOURCES
126128
127129
ADD_LIBRARY(${PROJECT_NAME} SHARED
128130
${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
129-
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR}
130-
${Boost_INCLUDE_DIRS})
131+
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR})
131132
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
132-
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${Boost_LIBRARIES})
133+
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC Boost::serialization Boost::system Boost::thread)
133134
134135
IF(UNIX)
135136
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS} pthread)
@@ -148,7 +149,9 @@ SET(PKG_CONFIG_EXTRA "plugindir=${DYNAMIC_GRAPH_PLUGINDIR}")
148149
SET(CMAKE_INSTALL_RPATH "${DYNAMIC_GRAPH_PLUGINDIR}")
149150
150151
ADD_SUBDIRECTORY(src)
151-
ADD_SUBDIRECTORY(tests)
152+
IF(BUILD_TESTING)
153+
ADD_SUBDIRECTORY(tests)
154+
ENDIF(BUILD_TESTING)
152155
153156
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
154157
INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME})

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ADD_DEFINITIONS(-DTESTS_DYNLIBSUFFIX="${CMAKE_SHARED_LIBRARY_SUFFIX}")
88

99
MACRO(DYNAMIC_GRAPH_TEST NAME)
1010
ADD_UNIT_TEST(${NAME} ${NAME}.cpp)
11-
TARGET_LINK_LIBRARIES(${NAME} PRIVATE ${PROJECT_NAME} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
11+
TARGET_LINK_LIBRARIES(${NAME} PRIVATE ${PROJECT_NAME} Boost::unit_test_framework)
1212
ENDMACRO(DYNAMIC_GRAPH_TEST)
1313

1414
# Signal cast test.

0 commit comments

Comments
 (0)