Skip to content

Commit df484fc

Browse files
committed
[CMake] sync submodule and its use
1 parent 3c5f16f commit df484fc

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
4444

4545
# Project dependencies
4646
ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "eigen3 >= 3.2.92")
47-
SET(BOOST_COMPONENTS unit_test_framework)
48-
SEARCH_FOR_BOOST()
47+
FIND_PACKAGE(Boost REQUIRED COMPONENTS unit_test_framework)
4948

5049
# Main Library
5150
SET(${PROJECT_NAME}_HEADERS
@@ -65,8 +64,7 @@ IF(TRACE_SOLVER)
6564
TARGET_COMPILE_DEFINITIONS(${PROJECT_NAME} PRIVATE TRACE_SOLVER)
6665
ENDIF(TRACE_SOLVER)
6766

68-
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PRIVATE ${EIGEN3_INCLUDE_DIR})
69-
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM INTERFACE ${EIGEN3_INCLUDE_DIR})
67+
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR})
7068
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
7169
INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)
7270

tests/CMakeLists.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,14 @@ SET(TESTS
2323
eiquadprog-fast
2424
eiquadprog-rt
2525
eiquadprog-both
26+
test-integration
2627
)
2728

2829
FOREACH(test ${TESTS})
2930
ADD_UNIT_TEST(${test} ${test}.cpp)
30-
TARGET_LINK_LIBRARIES(${test} ${PROJECT_NAME}
31-
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
31+
TARGET_LINK_LIBRARIES(${test} ${PROJECT_NAME} Boost::unit_test_framework)
3232
ENDFOREACH(test ${TESTS})
3333

3434
ADD_LIBRARY(testab SHARED TestA.cpp TestB.cpp)
35-
TARGET_INCLUDE_DIRECTORIES(testab SYSTEM PRIVATE ${EIGEN3_INCLUDE_DIR})
36-
TARGET_LINK_LIBRARIES( testab ${PROJECT_NAME})
37-
38-
ADD_UNIT_TEST(test-integration test-integration.cpp )
39-
TARGET_LINK_LIBRARIES(test-integration
40-
testab ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
35+
TARGET_LINK_LIBRARIES(testab ${PROJECT_NAME})
36+
TARGET_LINK_LIBRARIES(test-integration testab)

0 commit comments

Comments
 (0)