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
cmake: indent cosmetics
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
26f1be5
..
8f53fac
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,11
+1,9
@@
# Build the version number
set(SIMGRID_VERSION_MAJOR "3")
# Build the version number
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "2
4
")
+set(SIMGRID_VERSION_MINOR "2
5
")
set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot
set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot
-set(SIMGRID_VERSION_DATE "2019") # Year for copyright information
-
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
else()
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
else()
@@
-21,6
+19,10
@@
set(libsimgrid-java_version "${release_version}")
# Basic checks on cmake
cmake_minimum_required(VERSION 3.5)
# Basic checks on cmake
cmake_minimum_required(VERSION 3.5)
+#for lto, to avoid warning (should be removed when switching to requiring cmake >= 3.9)
+if(CMAKE_VERSION VERSION_GREATER "3.9")
+ cmake_policy(SET CMP0069 NEW)
+endif()
message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/tools/cmake/Modules)
message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/tools/cmake/Modules)
@@
-231,6
+233,11
@@
if(enable_ns3)
endif()
endif()
endif()
endif()
+set(SIMGRID_HAVE_MSG 0)
+if(enable_msg)
+ set(SIMGRID_HAVE_MSG 1)
+endif()
+
if(WIN32)
set(Boost_USE_STATIC_LIBS 1)
endif()
if(WIN32)
set(Boost_USE_STATIC_LIBS 1)
endif()
@@
-319,7
+326,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("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)
CHECK_INCLUDE_FILE("linux/futex.h" HAVE_FUTEX_H)
CHECK_FUNCTION_EXISTS(dlfunc HAVE_DLFUNC)
@@
-408,19
+414,23
@@
endif()
mark_as_advanced(PATH_LIBDW_H)
mark_as_advanced(PATH_LIBDW_LIB)
mark_as_advanced(PATH_LIBDW_H)
mark_as_advanced(PATH_LIBDW_LIB)
+if(enable_java AND NOT enable_msg)
+ message(FATAL_ERROR "Cannot activate the Java bindings without the MSG module. Either add -Denable_msg=ON or -Denable_java=OFF")
+endif()
+
if (enable_model-checking AND enable_ns3)
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 pull
s
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)
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)
SET(HAVE_PRIVATIZATION 0)
+ else()
+ SET(HAVE_PRIVATIZATION 1)
endif()
else()
SET(HAVE_SMPI 0)
endif()
else()
SET(HAVE_SMPI 0)
@@
-430,6
+440,7
@@
endif()
### Check what context backends are available
set(HAVE_UCONTEXT_CONTEXTS 0)
### 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)
if(NOT HAVE_UCONTEXT_H)
message(STATUS "No ucontext factory: <ucontext.h> not found.")
elseif(APPLE)
@@
-927,23
+938,29
@@
message(" LDFlags .....................: ${CMAKE_C_LINK_FLAGS}")
message(" with LTO ....................: ${enable_lto}")
message("")
message(" with LTO ....................: ${enable_lto}")
message("")
+if (SIMGRID_HAVE_MSG)
+ message(" Compile MSG .................: ON")
+else()
+ message(" Compile MSG .................: OFF")
+endif()
+
if (SIMGRID_HAVE_NS3)
if (SIMGRID_HAVE_NS3)
- message(" Compile ns-3 ................:
yes
(path: ${NS3_PATH})")
+ message(" Compile ns-3 ................:
ON
(path: ${NS3_PATH})")
else()
else()
- message(" Compile ns-3 ................:
NO
(hint: ${NS3_HINT})")
+ message(" Compile ns-3 ................:
OFF
(hint: ${NS3_HINT})")
endif()
if (${Java_FOUND})
endif()
if (${Java_FOUND})
- message(" Compile Java ................:
yes
")
+ message(" Compile Java ................:
ON
")
message(" Native lib in jar .........: ${enable_lib_in_jar}")
else()
message(" Native lib in jar .........: ${enable_lib_in_jar}")
else()
- message(" Compile Java ................:
NO
")
+ message(" Compile Java ................:
OFF
")
endif()
if(pybind11_FOUND)
message(" Compile Python bindings .....: ${enable_python}")
message(" module ....................: ${PYTHON_MODULE_PREFIX}simgrid${PYTHON_MODULE_EXTENSION}")
else()
endif()
if(pybind11_FOUND)
message(" Compile Python bindings .....: ${enable_python}")
message(" module ....................: ${PYTHON_MODULE_PREFIX}simgrid${PYTHON_MODULE_EXTENSION}")
else()
- message(" Compile Python bindings .....:
NO
(disabled, or pybind11 not found)")
+ message(" Compile Python bindings .....:
OFF
(disabled, or pybind11 not found)")
endif()
message(" Compile Lua .................: ${SIMGRID_HAVE_LUA}")
message(" Compile Smpi ................: ${HAVE_SMPI}")
endif()
message(" Compile Lua .................: ${SIMGRID_HAVE_LUA}")
message(" Compile Smpi ................: ${HAVE_SMPI}")