From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 3 Jun 2018 19:16:18 +0000 (+0200)
Subject: Try to fix the link to Boost_UNIT_TEST_FRAMEWORK
X-Git-Tag: v3.20~158
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9c96d1e734db048432e62cb59bb0b26a0e61ab99

Try to fix the link to Boost_UNIT_TEST_FRAMEWORK

Thanks to Olivier for the patch. It (fix: #267).
---

diff --git a/ChangeLog b/ChangeLog
index 59b8de448a..46c7daae6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@ XBT:
 Fixed bugs:
  - #143: Setting a breakpoint at a given time
  - #258: daemonized actors hang after all non-daemonized actors have completed
+ - #267: Linker error on unit_tmgr
 
 ----------------------------------------------------------------------------
 
diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index d596f3628c..a33fab0607 100644
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -91,7 +91,8 @@ ADD_TEST(testall                                 ${CMAKE_BINARY_DIR}/testall)
 # New tests should use the Boost Unit Test Framework
 if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
   add_executable       (unit_tmgr src/surf/trace_mgr_test.cpp)
-  target_link_libraries(unit_tmgr simgrid ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  get_filename_component(Boost_UNIT_TEST_FRAMEWORK_LIBRARY_dir ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} DIRECTORY)
+  target_link_libraries(unit_tmgr simgrid "-L${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_dir}" "-lboost_unit_test_framework")
   ADD_TEST(unit_tmgr ${CMAKE_BINARY_DIR}/unit_tmgr --build_info=yes)
   set_property(
     TARGET unit_tmgr