X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9104957deccc59e0e804215d5db498fabfd40d29..f322f94ddd9c5b0c80377fe0bbec20e57055ff10:/tools/cmake/MakeLib.cmake

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index b29b5921d7..e84134e95d 100644
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -10,7 +10,7 @@ if(APPLE)
 
   # 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()
 
 ###############################
@@ -27,6 +27,9 @@ set_property(TARGET simgrid
 add_dependencies(simgrid maintainer_files)
 
 if(enable_model-checking)
+  add_custom_target(tests-mc COMMENT "Recompiling the MC tests and tools.")
+  add_dependencies(tests tests-mc)
+
   add_executable(simgrid-mc ${MC_SIMGRID_MC_SRC})
   target_link_libraries(simgrid-mc simgrid)
   set_target_properties(simgrid-mc
@@ -34,8 +37,8 @@ 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/)
-  add_dependencies(tests simgrid-mc)
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/)
+  add_dependencies(tests-mc simgrid-mc)
 endif()
 
 
@@ -109,7 +112,7 @@ if(enable_smpi)
   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)
@@ -118,7 +121,7 @@ if(enable_smpi)
   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)
@@ -130,7 +133,7 @@ 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")