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
f3e237c
..
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)
@@
-232,7
+234,7
@@
if(enable_ns3)
endif()
set(SIMGRID_HAVE_MSG 0)
endif()
set(SIMGRID_HAVE_MSG 0)
-if(enable_
MSG
)
+if(enable_
msg
)
set(SIMGRID_HAVE_MSG 1)
endif()
set(SIMGRID_HAVE_MSG 1)
endif()
@@
-412,8
+414,8
@@
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")
+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)
endif()
if (enable_model-checking AND enable_ns3)