Clearly state that we don't care about the return code of actors

[simgrid.git] / tools / cmake / MakeLib.cmake

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index ba435a6..38890f4 100644 (file)
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -24,11 +24,14 @@ set_target_properties(simgrid PROPERTIES VERSION ${libsimgrid_version})
 set_property(TARGET simgrid
              APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
 
+# Don't complain when we cast (int (*)(int,char**)) into (void(*)(int,char**))
+# This will stop when MSG goes away
+set_property(SOURCE ${CMAKE_HOME_DIRECTORY}/src/msg/msg_legacy.cpp   PROPERTY COMPILE_FLAGS -Wno-error=cast-function-type)
+set_property(SOURCE ${CMAKE_HOME_DIRECTORY}/src/msg/msg_process.cpp  PROPERTY COMPILE_FLAGS -Wno-error=cast-function-type)
+
 add_dependencies(simgrid maintainer_files)
 
 if(enable_model-checking)
-  set_property(TARGET simgrid PROPERTY CXX_STANDARD 14)
-
   add_executable(simgrid-mc ${MC_SIMGRID_MC_SRC})
   target_link_libraries(simgrid-mc simgrid)
   set_target_properties(simgrid-mc
@@ -62,7 +65,7 @@ if (HAVE_BOOST_ADDR2LINE_BACKTRACE)
 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)
@@ -135,6 +138,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()
@@ -167,7 +173,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})