plug leak and check received payload

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0669a57..adf4eec 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -319,7 +319,6 @@ CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
 CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
 CHECK_INCLUDE_FILE("sys/sysctl.h" HAVE_SYS_SYSCTL_H)
-CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H)
 CHECK_INCLUDE_FILE("linux/futex.h" HAVE_FUTEX_H)
 
 CHECK_FUNCTION_EXISTS(dlfunc HAVE_DLFUNC)
@@ -409,18 +408,18 @@ 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 ns-3 bindings: ns-3 pull too much dependencies for the MC to work")
+  message(FATAL_ERROR "Cannot activate both model-checking and ns-3 bindings: ns-3 pulls too much dependencies for the MC to work")
 endif()
 
 get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
 
 if(enable_smpi)
   SET(HAVE_SMPI 1)
-  if(NOT WIN32)
-    SET(HAVE_PRIVATIZATION 1)
-  else()
-    message (STATUS "Warning:  no support for SMPI automatic privatization on this platform")
+  if(WIN32)
+    message (STATUS "Warning: no support for SMPI automatic privatization on Windows.")
     SET(HAVE_PRIVATIZATION 0)
+  else()
+    SET(HAVE_PRIVATIZATION 1)
   endif()
 else()
   SET(HAVE_SMPI 0)
@@ -430,6 +429,7 @@ endif()
 ### Check what context backends are available
 
 set(HAVE_UCONTEXT_CONTEXTS 0)
+CHECK_INCLUDE_FILE("ucontext.h" HAVE_UCONTEXT_H)
 if(NOT HAVE_UCONTEXT_H)
   message(STATUS "No ucontext factory: <ucontext.h> not found.")
 elseif(APPLE)
@@ -803,8 +803,8 @@ if((NOT DEFINED enable_python) OR enable_python)
     else()
       find_package(pybind11 CONFIG)
       message(STATUS "Pybind11 version: ${pybind11_VERSION}")
-      if (pybind11_VERSION VERSION_LESS 2.2)
-        message(STATUS "SimGrid needs at least v2.2 of pybind11. Disabling the Python bindings.")
+      if (pybind11_VERSION VERSION_LESS 2.4)
+        message(STATUS "SimGrid needs at least v2.4 of pybind11. Disabling the Python bindings.")
         set(pybind11_FOUND OFF)
       endif()
     endif()