X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92e4eb1c61e62840aa7cc4be72aad837d0fe8249..6fbcdfade89b3812c24152c86f8aa3be510df7f2:/tools/cmake/MakeLib.cmake

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index d7f1ade087..4afca47839 100644
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -2,15 +2,16 @@
 
 # On macOS, specify that rpath is useful to look for the dependencies
 # See https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling and Java.cmake
+# TODO: is it still useful now that Java is gone? For Python maybe?
 set(CMAKE_MACOSX_RPATH TRUE)
 if(APPLE)
   SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # When installed, use system path
-  set(CMAKE_SKIP_BUILD_RPATH FALSE)         # When executing from build tree, take the lib from the build path if exists
-  set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) # When executing from build tree, take the lib from the system path if exists
+  set(CMAKE_SKIP_BUILD_RPATH FALSE)         # When executing from build tree, take the lib from the build path if exists
+  set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) # When executing from build tree, take the lib from the system path if exists
 
   # add the current location of libsimgrid-java.dynlib as a location for libsimgrid.dynlib
   # (useful when unpacking the native libraries from the jarfile)
-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
 endif()
 
 ###############################
@@ -26,6 +27,21 @@ set_property(TARGET simgrid
 
 add_dependencies(simgrid maintainer_files)
 
+if("${CMAKE_SYSTEM}" MATCHES "Linux")
+  add_library(sthread SHARED ${STHREAD_SRC})
+  set_property(TARGET sthread
+                APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
+  target_link_libraries(sthread simgrid)
+else()
+  set(EXTRA_DIST ${EXTRA_DIST} ${STHREAD_SRC})
+endif()
+
+if(HAVE_MMALLOC)
+  add_library(sgmalloc SHARED ${SGMALLOC_SRC})
+  set_property(TARGET sgmalloc
+                APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
+endif()
+
 if(enable_model-checking)
   add_executable(simgrid-mc ${MC_SIMGRID_MC_SRC})
   target_link_libraries(simgrid-mc simgrid)
@@ -34,25 +50,35 @@ if(enable_model-checking)
   set_property(TARGET simgrid-mc
                APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
   install(TARGETS simgrid-mc # install that binary without breaking the rpath on Mac
-    RUNTIME DESTINATION bin/)
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/)
+  add_dependencies(tests-mc simgrid-mc)
+  if("${CMAKE_SYSTEM}" MATCHES "Linux")
+    add_dependencies(tests-mc sthread)
+  endif()
 endif()
 
-
 # Compute the dependencies of SimGrid
 #####################################
+# search for dlopen
+if("${CMAKE_SYSTEM_NAME}" MATCHES "kFreeBSD|Linux|SunOS")
+  find_library(DL_LIBRARY dl)
+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(CMAKE_USE_PTHREADS_INIT AND ${HAVE_THREAD_CONTEXTS})
-  set(SIMGRID_DEP "${SIMGRID_DEP} ${CMAKE_THREAD_LIBS_INIT}")
+if (HAVE_BOOST_ADDR2LINE_BACKTRACE)
+  target_link_libraries(simgrid ${Boost_STACKTRACE_ADDR2LINE_LIBRARY})
 endif()
 
-if(SIMGRID_HAVE_LUA)
-  ADD_CUSTOM_TARGET(link_simgrid_lua ALL
-    DEPENDS 	simgrid
-    )
-  SET(SIMGRID_DEP "${SIMGRID_DEP} ${LUA_LIBRARY} ${DL_LIBRARY}")
+if(CMAKE_USE_PTHREADS_INIT)
+  target_link_libraries(simgrid ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
 if(HAVE_PAPI)
@@ -69,7 +95,7 @@ if(HAVE_GRAPHVIZ)
   endif()
 endif()
 
-if(SIMGRID_HAVE_MC AND NOT ${DL_LIBRARY} STREQUAL "")
+if(NOT ${DL_LIBRARY} STREQUAL "")
   SET(SIMGRID_DEP "${SIMGRID_DEP} ${DL_LIBRARY}")
 endif()
 
@@ -85,24 +111,22 @@ endif()
 ##################################
 
 if(enable_smpi)
-  if(NOT ${DL_LIBRARY} STREQUAL "")
-    set(SIMGRID_DEP "${SIMGRID_DEP} ${DL_LIBRARY}") # for privatization
-  endif()
-
   add_executable(smpimain src/smpi/smpi_main.c)
   target_link_libraries(smpimain simgrid)
   set_target_properties(smpimain
     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/simgrid)
   install(TARGETS smpimain # install that binary without breaking the rpath on Mac
-    RUNTIME DESTINATION lib/simgrid)
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/simgrid)
+  add_dependencies(tests smpimain)
 
   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
-    RUNTIME DESTINATION lib/simgrid)
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/simgrid)
+  add_dependencies(tests smpireplaymain)
 
   if(SMPI_FORTRAN)
     if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
@@ -113,9 +137,12 @@ if(enable_smpi)
       SET(SIMGRID_DEP "${SIMGRID_DEP} -lflang")
       if("${CMAKE_SYSTEM}" MATCHES "FreeBSD")
         set(SIMGRID_DEP "${SIMGRID_DEP} -lexecinfo")
-        if ("${CMAKE_SYSTEM_VERSION}" MATCHES "12")
+	if ("${CMAKE_SYSTEM_VERSION}" STRGREATER_EQUAL "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()
@@ -145,9 +172,10 @@ FIND_LIBRARY(GCCLIBATOMIC_LIBRARY NAMES atomic atomic.so.1 libatomic.so.1
 if(CMAKE_COMPILER_IS_GNUCC AND GCCLIBATOMIC_LIBRARY)
     set(SIMGRID_DEP   "${SIMGRID_DEP}   -Wl,--as-needed -latomic -Wl,--no-as-needed")
 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})
@@ -157,9 +185,6 @@ target_link_libraries(simgrid 	${SIMGRID_DEP})
 if(enable_maintainer_mode)
   add_dependencies(simgrid smpi_generated_headers_call_location_tracing)
 endif()
-if(enable_maintainer_mode AND PYTHON_EXE)
-  add_dependencies(simgrid simcalls_generated_src)
-endif()
 if(enable_maintainer_mode AND BISON_EXE AND LEX_EXE)
   add_dependencies(simgrid automaton_generated_src)
 endif()