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
doc: fix borken links
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
362a0f0
..
00e11f5
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
@@
-100,8
+94,8
@@
endif()
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "2
2
")
-set(SIMGRID_VERSION_PATCH "
5
") # odd => git branch; even => stable release or released snapshot
+set(SIMGRID_VERSION_MINOR "2
3
")
+set(SIMGRID_VERSION_PATCH "
0
") # odd => git branch; even => stable release or released snapshot
set(SIMGRID_VERSION_DATE "2019") # Year for copyright information
set(SIMGRID_VERSION_DATE "2019") # Year for copyright information
@@
-232,7
+226,7
@@
if(enable_ns3)
set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}")
endforeach()
else()
set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}")
endforeach()
else()
- message(FATAL_ERROR "Cannot find
NS
3. 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()
endif()
endif()
@@
-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()
@@
-411,12
+405,12
@@
mark_as_advanced(PATH_LIBDW_H)
mark_as_advanced(PATH_LIBDW_LIB)
if (enable_model-checking AND enable_ns3)
mark_as_advanced(PATH_LIBDW_LIB)
if (enable_model-checking AND enable_ns3)
- message(FATAL_ERROR "Cannot activate both model-checking and
NS3 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 pull too much dependencies for the MC to work")
endif()
if(enable_smpi)
SET(HAVE_SMPI 1)
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")
SET(HAVE_PRIVATIZATION 1)
else()
message (STATUS "Warning: no support for SMPI automatic privatization on this platform")
@@
-794,7
+788,11
@@
if((NOT DEFINED enable_python) OR enable_python)
find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} REQUIRED)
else()
find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} REQUIRED)
else()
- find_package(pybind11 2.2.0)
+ 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()
@@
-920,9
+918,9
@@
message(" with LTO ....................: ${enable_lto}")
message("")
if (SIMGRID_HAVE_NS3)
message("")
if (SIMGRID_HAVE_NS3)
- message(" Compile
NS
-3 ................: yes (path: ${NS3_PATH})")
+ message(" Compile
ns
-3 ................: yes (path: ${NS3_PATH})")
else()
else()
- message(" Compile
NS
-3 ................: NO (hint: ${NS3_HINT})")
+ message(" Compile
ns
-3 ................: NO (hint: ${NS3_HINT})")
endif()
if (${Java_FOUND})
endif()
if (${Java_FOUND})