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
start the cycle of 3.23.3
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
50075e0
..
180be71
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,9
+94,8
@@
endif()
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "22")
-set(SIMGRID_VERSION_PATCH "90")
-set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
+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
set(SIMGRID_VERSION_DATE "2019") # Year for copyright information
@@
-214,11
+207,14
@@
include(CheckLibraryExists)
include(CheckSymbolExists)
set(HAVE_GRAPHVIZ 0)
include(CheckSymbolExists)
set(HAVE_GRAPHVIZ 0)
-include(FindGraphviz)
-
set(SIMGRID_HAVE_LUA 0)
set(SIMGRID_HAVE_LUA 0)
-if(enable_lua)
- include(FindLuaSimgrid)
+if(minimal-bindings)
+ message(STATUS "Don't even look for graphviz nor lua, as we build minimal binding libraries.")
+else()
+ include(FindGraphviz)
+ if(enable_lua)
+ include(FindLuaSimgrid)
+ endif()
endif()
set(SIMGRID_HAVE_NS3 0)
endif()
set(SIMGRID_HAVE_NS3 0)
@@
-230,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()
@@
-264,8
+260,8
@@
set(_Boost_STACKTRACE_HEADERS "boost/stacktrace.hpp")
set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
set(_Boost_STACKTRACE_ADDR2LINE_HEADERS "boost/stacktrace.hpp")
set(_Boost_STACKTRACE_BACKTRACE_HEADERS "boost/stacktrace.hpp")
set(_Boost_STACKTRACE_ADDR2LINE_HEADERS "boost/stacktrace.hpp")
-if(minimal
_java
) # When we want a minimal jarfile, don't even search for boost optional components
- message(STATUS "Don't even look for boost optional components, as we build
a minimal jar file
")
+if(minimal
-bindings
) # When we want a minimal jarfile, don't even search for boost optional components
+ message(STATUS "Don't even look for boost optional components, as we build
minimal binding libraries.
")
else()
find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace stacktrace_addr2line)
set(Boost_FOUND 1) # These components are optionals
else()
find_package(Boost 1.59 COMPONENTS context stacktrace_backtrace stacktrace_addr2line)
set(Boost_FOUND 1) # These components are optionals
@@
-374,10
+370,10
@@
else()
SET(SIMGRID_HAVE_MALLOCATOR 0)
endif()
SET(SIMGRID_HAVE_MALLOCATOR 0)
endif()
-if (minimal
_java
)
- message(STATUS "Don't look for libunwind as we build
a minimal jar file
.")
+if (minimal
-bindings
)
+ message(STATUS "Don't look for libunwind as we build
minimal binding libraries
.")
if(enable_model-checking)
if(enable_model-checking)
- message(FATAL_ERROR "You cannot enable model-checking and minimal
_java
at the same time.")
+ message(FATAL_ERROR "You cannot enable model-checking and minimal
-bindings
at the same time.")
endif()
else()
include(FindLibunwind)
endif()
else()
include(FindLibunwind)
@@
-398,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()
@@
-409,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")
@@
-792,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)
@@
-811,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()
@@
-918,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})