Skip to content

Commit e9e8529

Browse files
committed
Merge remote-tracking branch 'origin/devel' into cpp11
2 parents e400b01 + 3f96ae5 commit e9e8529

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ SET(${PROJECT_NAME}_SOURCES
171171
ADD_LIBRARY(${PROJECT_NAME} SHARED
172172
${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
173173
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
174+
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
175+
SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
174176
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${Boost_LIBRARIES}
175177
dynamic-graph::dynamic-graph pinocchio::pinocchio)
176178

tests/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,23 @@ IF(UNIX)
106106
ADD_EXECUTABLE(test_abstract_interface tools/test_abstract_interface.cpp)
107107
TARGET_LINK_LIBRARIES(test_abstract_interface
108108
pluginabstract ${CMAKE_DL_LIBS} ${Boost_LIBRARIES})
109+
TARGET_INCLUDE_DIRECTORIES(test_abstract_interface
110+
SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
111+
109112
ENDIF(UNIX)
110113

111114
FOREACH(path ${tests})
112115
GET_FILENAME_COMPONENT(test ${path} NAME)
113116
ADD_UNIT_TEST(${test} ${path}.cpp)
114117

115-
TARGET_LINK_LIBRARIES(${test} ${PROJECT_NAME} ${Boost_LIBRARIES}
118+
TARGET_LINK_LIBRARIES(${test}
119+
PUBLIC
120+
${PROJECT_NAME}
116121
${TEST_${test}_LIBS} ${TEST_${test}_EXT_LIBS}
117122
dynamic-graph::dynamic-graph)
118123

119124
IF(UNIX)
120-
TARGET_LINK_LIBRARIES(${test} ${CMAKE_DL_LIBS})
125+
TARGET_LINK_LIBRARIES(${test} PUBLIC ${CMAKE_DL_LIBS})
121126
ENDIF(UNIX)
122127
ENDFOREACH(path ${tests})
123128

0 commit comments

Comments
 (0)