diff options
author | tlacombe <lacombe1993@gmail.com> | 2020-03-03 10:21:35 +0100 |
---|---|---|
committer | tlacombe <lacombe1993@gmail.com> | 2020-03-03 10:21:35 +0100 |
commit | 16e04f4f14cc73956064aef283e29134f00d306c (patch) | |
tree | a7c37e2d98ef9c669e23cde5323c831dc297c801 /src/cmake/modules/GUDHI_boost_test.cmake | |
parent | 0998cecac7f15e3c68058d33acc21fb427f803e9 (diff) | |
parent | d2943b9e7311c8a3d8a4fb379c39b15497481b9c (diff) |
Merge remote-tracking branch 'upstream/master' into wbary-theo
udpating for travis and circleCI
Diffstat (limited to 'src/cmake/modules/GUDHI_boost_test.cmake')
-rw-r--r-- | src/cmake/modules/GUDHI_boost_test.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/cmake/modules/GUDHI_boost_test.cmake b/src/cmake/modules/GUDHI_boost_test.cmake index c3b29883..4a13404b 100644 --- a/src/cmake/modules/GUDHI_boost_test.cmake +++ b/src/cmake/modules/GUDHI_boost_test.cmake @@ -9,7 +9,6 @@ if (WITH_GUDHI_BOOST_TEST_COVERAGE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") endif() set(GUDHI_UT_LOG_FORMAT "--log_format=XML") - set(GUDHI_UT_LOG_SINK "--log_sink=${CMAKE_BINARY_DIR}/${unitary_test}_UT.xml") set(GUDHI_UT_LOG_LEVEL "--log_level=test_suite") set(GUDHI_UT_REPORT_LEVEL "--report_level=no") else (WITH_GUDHI_BOOST_TEST_COVERAGE) @@ -19,7 +18,11 @@ else (WITH_GUDHI_BOOST_TEST_COVERAGE) endif(WITH_GUDHI_BOOST_TEST_COVERAGE) function(gudhi_add_boost_test unitary_test) - target_link_libraries(${unitary_test} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) + if (WITH_GUDHI_BOOST_TEST_COVERAGE) + set(GUDHI_UT_LOG_SINK "--log_sink=${CMAKE_BINARY_DIR}/${unitary_test}_UT.xml") + endif(WITH_GUDHI_BOOST_TEST_COVERAGE) + + target_link_libraries(${unitary_test} Boost::unit_test_framework) add_test(NAME ${unitary_test} COMMAND $<TARGET_FILE:${unitary_test}> ${GUDHI_UT_LOG_FORMAT} ${GUDHI_UT_LOG_SINK} ${GUDHI_UT_LOG_LEVEL} ${GUDHI_UT_REPORT_LEVEL}) |