Ensure boost tests are linked statically or dynamically, depending on…

… build (#23)
erikerlandson · Jan 10, 2020 · 9ca89ad · 9ca89ad
1 parent ae21401
commit 9ca89ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -15,9 +15,11 @@ if (Boost_FOUND)
                    ut_ordered.cpp
                    ut_keyed.cpp
                   )
-    include_directories(${Boost_INCLUDE_DIR})
     target_compile_definitions(unit_tests PRIVATE BOOST_ALL_NO_LIB=1)
-    target_link_libraries(unit_tests ${Boost_LIBRARIES})
+    if (NOT Boost_USE_STATIC_LIBS)
+        target_compile_definitions(unit_tests PRIVATE BOOST_TEST_DYN_LINK=1)
+    endif ()
+    target_link_libraries(unit_tests Boost::unit_test_framework)
 
     add_test(NAME unit_tests COMMAND unit_tests)
     add_custom_target(test COMMAND unit_tests DEPENDS unit_tests)

diff --git a/tests/unit_tests.cpp b/tests/unit_tests.cpp
@@ -1,3 +1,2 @@
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE st_tree
 #include <boost/test/unit_test.hpp>