X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a1d9713c8dd8a96686f75acb428b2e4dcb08c1f..dfafe652e9ae62c35cd0fc084b117fc987b3e8dc:/tools/cmake/MakeLib.cmake

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index 5575bb7188..79f4e27205 100644
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -29,6 +29,7 @@ add_dependencies(simgrid maintainer_files)
 
 if("${CMAKE_SYSTEM}" MATCHES "Linux")
   add_library(sthread SHARED ${STHREAD_SRC})
+  set_target_properties(sthread PROPERTIES VERSION ${libsimgrid_version})
   set_property(TARGET sthread
                 APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
   target_link_libraries(sthread simgrid)
@@ -36,23 +37,19 @@ else()
   set(EXTRA_DIST ${EXTRA_DIST} ${STHREAD_SRC})
 endif()
 
-if(HAVE_MMALLOC)
-  add_library(sgmalloc SHARED ${SGMALLOC_SRC})
-  set_property(TARGET sgmalloc
+if(SIMGRID_HAVE_MC)
+  add_executable(simgrid-mc ${MC_SIMGRID_MC_SRC})
+  target_link_libraries(simgrid-mc simgrid)
+  set_target_properties(simgrid-mc
+                        PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+  set_property(TARGET simgrid-mc
                 APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")
-endif()
-
-add_executable(simgrid-mc ${MC_SIMGRID_MC_SRC})
-target_link_libraries(simgrid-mc simgrid)
-set_target_properties(simgrid-mc
-                      PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-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 ${CMAKE_INSTALL_BINDIR}/)
-add_dependencies(tests-mc simgrid-mc)
-if("${CMAKE_SYSTEM}" MATCHES "Linux")
-  add_dependencies(tests-mc sthread)
+  install(TARGETS simgrid-mc # install that binary without breaking the rpath on Mac
+    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
@@ -176,10 +173,6 @@ if(CMAKE_COMPILER_IS_GNUCC AND GCCLIBATOMIC_LIBRARY)
 endif()
 mark_as_advanced(GCCLIBATOMIC_LIBRARY)
 
-if(enable_model-checking AND (NOT LINKER_VERSION VERSION_LESS "2.30"))
-    set(SIMGRID_DEP   "${SIMGRID_DEP}   -Wl,-znorelro -Wl,-znoseparate-code")
-endif()
-
 target_link_libraries(simgrid 	${SIMGRID_DEP})
 
 # Dependencies from maintainer mode
@@ -187,6 +180,3 @@ 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 BISON_EXE AND LEX_EXE)
-  add_dependencies(simgrid automaton_generated_src)
-endif()