A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kill dead code
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
6d5b8ad
..
ed680f2
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-13,12
+13,6
@@
set(SMPI_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Check for the compiler #
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# 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
##
## Check the C/C++ standard that we need
## See also tools/cmake/Flags.cmake that sets our paranoid warning flags
@@
-400,7
+394,7
@@
if(enable_model-checking)
set(SIMGRID_DEP "${SIMGRID_DEP} ${LIBEVENT_LIBRARIES} ${LIBELF_LIBRARIES} ${LIBDW_LIBRARIES}")
set(SIMGRID_HAVE_MC 1)
if("${CMAKE_SYSTEM}" MATCHES "FreeBSD" AND enable_java)
set(SIMGRID_DEP "${SIMGRID_DEP} ${LIBEVENT_LIBRARIES} ${LIBELF_LIBRARIES} ${LIBDW_LIBRARIES}")
set(SIMGRID_HAVE_MC 1)
if("${CMAKE_SYSTEM}" MATCHES "FreeBSD" AND enable_java)
- message(WARNING "FreeBSD + Model-Checking + Java = too much for now. Disabling
java
")
+ message(WARNING "FreeBSD + Model-Checking + Java = too much for now. Disabling
the Java bindings.
")
set(enable_java FALSE)
endif()
else()
set(enable_java FALSE)
endif()
else()
@@
-795,6
+789,10
@@
if((NOT DEFINED enable_python) OR enable_python)
else()
find_package(pybind11 CONFIG)
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)
endif()
if(NOT PYTHONLIBS_FOUND)
@@
-813,7
+811,7
@@
endif()
option(enable_python "Whether the Python bindings are activated." ${pybind11_FOUND}) # ON by default if dependencies are met
if("${CMAKE_SYSTEM}" MATCHES "FreeBSD" AND enable_model-checking AND enable_python)
option(enable_python "Whether the Python bindings are activated." ${pybind11_FOUND}) # ON by default if dependencies are met
if("${CMAKE_SYSTEM}" MATCHES "FreeBSD" AND enable_model-checking AND enable_python)
- message(WARNING "FreeBSD + Model-Checking + Python = too much for now. Disabling
python
.")
+ message(WARNING "FreeBSD + Model-Checking + Python = too much for now. Disabling
the Python bindings
.")
set(enable_python FALSE)
endif()
set(enable_python FALSE)
endif()