Merge branch 'tesh-check-output-on-timeout' into 'master'

[simgrid.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d5b8ad..fe961c1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,12 +13,6 @@ set(SMPI_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 #     Check for the compiler        #
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-
-### Need to set rc ccompiler before enable language
-if(WIN32)
-  SET(CMAKE_RC_COMPILER "windres")
-endif()
-
 ## 
 ## Check the C/C++ standard that we need
 ##   See also tools/cmake/Flags.cmake that sets our paranoid warning flags
@@ -795,6 +789,10 @@ if((NOT DEFINED enable_python) OR enable_python)
 
     else()
       find_package(pybind11 CONFIG)
+      if (pybind11_VERSION VERSION_LESS 2.2)
+        message(STATUS "SimGrid needs at least v2.2 of pybind11. Disabling the Python bindings (found version: ${pybind11_VERSION}).")
+        set(pybind11_FOUND OFF)
+      endif()
     endif()
 
     if(NOT PYTHONLIBS_FOUND)