X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..2c89244eb0c2a35bc594e9af457d4a03ed0db184:/tools/cmake/MakeLib.cmake

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index 203ddf4f11..b29b5921d7 100644
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -48,11 +48,19 @@ endif()
 mark_as_advanced(DL_LIBRARY)
 
 if (HAVE_BOOST_CONTEXTS)
-  set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
+  target_link_libraries(simgrid ${Boost_CONTEXT_LIBRARY})
+endif()
+
+if (HAVE_BOOST_STACKTRACE_BACKTRACE)
+  target_link_libraries(simgrid ${Boost_STACKTRACE_BACKTRACE_LIBRARY})
+endif()
+
+if (HAVE_BOOST_ADDR2LINE_BACKTRACE)
+  target_link_libraries(simgrid ${Boost_STACKTRACE_ADDR2LINE_LIBRARY})
 endif()
 
 if(CMAKE_USE_PTHREADS_INIT)
-  set(SIMGRID_DEP "${SIMGRID_DEP} ${CMAKE_THREAD_LIBS_INIT}")
+  target_link_libraries(simgrid ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
 if(SIMGRID_HAVE_LUA)
@@ -106,7 +114,7 @@ if(enable_smpi)
 
   add_executable(smpireplaymain src/smpi/smpi_replay_main.cpp)
   target_compile_options(smpireplaymain PRIVATE -fpic)
-  target_link_libraries(smpireplaymain simgrid -shared)
+  target_link_libraries(smpireplaymain simgrid -fpic -shared)
   set_target_properties(smpireplaymain
     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/simgrid)
   install(TARGETS smpireplaymain # install that binary without breaking the rpath on Mac
@@ -125,6 +133,9 @@ if(enable_smpi)
         if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12")
             set(SIMGRID_DEP "${SIMGRID_DEP} -lpgmath")
         endif()
+        if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12\.1")
+            set(SIMGRID_DEP "${SIMGRID_DEP} -lomp")
+        endif()
       endif()
     endif()
   endif()
@@ -157,7 +168,7 @@ endif()
 mark_as_advanced(GCCLIBATOMIC_LIBRARY)
 
 if(enable_model-checking AND (NOT LINKER_VERSION VERSION_LESS "2.30"))
-    set(SIMGRID_DEP   "${SIMGRID_DEP}   -Wl,-znoseparate-code")
+    set(SIMGRID_DEP   "${SIMGRID_DEP}   -Wl,-znorelro -Wl,-znoseparate-code")
 endif()
 
 target_link_libraries(simgrid 	${SIMGRID_DEP})