File tree Expand file tree Collapse file tree 2 files changed +9
-6
lines changed Expand file tree Collapse file tree 2 files changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,9 @@ CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE)
31
31
INCLUDE (cmake/pthread.cmake ) # needs to be included after the CXX definition
32
32
33
33
# 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 ()
35
37
ADD_PROJECT_DEPENDENCY (Boost REQUIRED COMPONENTS serialization system thread )
36
38
ADD_PROJECT_DEPENDENCY (Eigen3 REQUIRED PKG_CONFIG_REQUIRES eigen3 )
37
39
SEARCH_FOR_PTHREAD ()
@@ -126,10 +128,9 @@ SET(${PROJECT_NAME}_SOURCES
126
128
127
129
ADD_LIBRARY(${PROJECT_NAME} SHARED
128
130
${${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} )
131
132
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 )
133
134
134
135
IF(UNIX)
135
136
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS} pthread)
@@ -148,7 +149,9 @@ SET(PKG_CONFIG_EXTRA "plugindir=${DYNAMIC_GRAPH_PLUGINDIR}")
148
149
SET(CMAKE_INSTALL_RPATH " ${DYNAMIC_GRAPH_PLUGINDIR} ")
149
150
150
151
ADD_SUBDIRECTORY(src)
151
- ADD_SUBDIRECTORY(tests)
152
+ IF(BUILD_TESTING)
153
+ ADD_SUBDIRECTORY(tests)
154
+ ENDIF(BUILD_TESTING)
152
155
153
156
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME} )
154
157
INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME} )
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ ADD_DEFINITIONS(-DTESTS_DYNLIBSUFFIX="${CMAKE_SHARED_LIBRARY_SUFFIX}")
8
8
9
9
MACRO (DYNAMIC_GRAPH_TEST NAME )
10
10
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 )
12
12
ENDMACRO (DYNAMIC_GRAPH_TEST )
13
13
14
14
# Signal cast test.
You can’t perform that action at this time.
0 commit comments