X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f7f70d5b16f2dee72574a36146a11598e5907e34..02c55f124e39483550e0ced97ce787284e5dd2ca:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed680f238c..8e01132f58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,8 +94,8 @@ endif()
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "22")
-set(SIMGRID_VERSION_PATCH "5") # odd => git branch; even => stable release or released snapshot
+set(SIMGRID_VERSION_MINOR "23")
+set(SIMGRID_VERSION_PATCH "3") # odd => git branch; even => stable release or released snapshot
 
 set(SIMGRID_VERSION_DATE  "2019") # Year for copyright information
 
@@ -226,7 +226,7 @@ if(enable_ns3)
       set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}")
     endforeach()
   else()
-    message(FATAL_ERROR "Cannot find NS3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option")
+    message(FATAL_ERROR "Cannot find ns-3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option")
   endif()
 endif()
 
@@ -271,14 +271,14 @@ else()
   if (Boost_STACKTRACE_BACKTRACE_FOUND)
     message (STATUS "  stacktrace: found the fast 'backtrace' implementation. Activating human-readable stack traces.")
     set(HAVE_BOOST_STACKTRACE_BACKTRACE 1)
-    set(SIMGRID_DEP "${SIMGRID_DEP} -lboost_stacktrace_backtrace")
+    set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_STACKTRACE_BACKTRACE_LIBRARY}")
   else()
     set(HAVE_BOOST_STACKTRACE_BACKTRACE 0)
     
     if (Boost_STACKTRACE_ADDR2LINE_FOUND)
       message (STATUS "  stacktrace: found the slow 'addr2line' implementation. Activating human-readable stack traces.")
       set(HAVE_BOOST_STACKTRACE_ADDR2LINE 1)
-      set(SIMGRID_DEP "${SIMGRID_DEP} -lboost_stacktrace_addr2line")
+      set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_STACKTRACE_ADDR2LINE_LIBRARY}")
     else()
       message (STATUS "  stacktrace: MISSING. Install libboost-stacktrace-dev to display the stacktraces.")
       set(HAVE_BOOST_STACKTRACE_ADDR2LINE 0)
@@ -405,12 +405,12 @@ mark_as_advanced(PATH_LIBDW_H)
 mark_as_advanced(PATH_LIBDW_LIB)
 
 if (enable_model-checking AND enable_ns3)
-  message(FATAL_ERROR "Cannot activate both model-checking and NS3 bindings: NS3 pull too much dependencies for the MC to work")
+  message(FATAL_ERROR "Cannot activate both model-checking and ns-3 bindings: ns-3 pull too much dependencies for the MC to work")
 endif()
 
 if(enable_smpi)
   SET(HAVE_SMPI 1)
-  if("${CMAKE_SYSTEM}" MATCHES "Darwin|FreeBSD|Linux|SunOS")
+  if(NOT WIN32)
     SET(HAVE_PRIVATIZATION 1)
   else()
     message (STATUS "Warning:  no support for SMPI automatic privatization on this platform")
@@ -918,9 +918,9 @@ message("        with LTO ....................: ${enable_lto}")
 message("")
 
 if (SIMGRID_HAVE_NS3)
-  message("        Compile NS-3 ................: yes (path: ${NS3_PATH})")
+  message("        Compile ns-3 ................: yes (path: ${NS3_PATH})")
 else()
-  message("        Compile NS-3 ................: NO  (hint: ${NS3_HINT})")
+  message("        Compile ns-3 ................: NO  (hint: ${NS3_HINT})")
 endif()
 
 if (${Java_FOUND})