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: Kill formating pragma that are unused since 10 years
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
18e19ac
..
b46a981
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-90,8
+90,8
@@
endif()
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "13")
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "13")
-set(SIMGRID_VERSION_PATCH "0")
-set(SIMGRID_VERSION_EXTRA "") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_PATCH "
9
0")
+set(SIMGRID_VERSION_EXTRA "
-prealpha
") # Extra words to add to version string (e.g. -rc1)
set(SIMGRID_VERSION_DATE "2016") # Year for copyright information
set(SIMGRID_VERSION_DATE "2016") # Year for copyright information
@@
-371,6
+371,10
@@
else()
SET(HAVE_MMALLOC 0)
endif()
SET(HAVE_MMALLOC 0)
endif()
+if (enable_model-checking AND enable_ns3)
+ message(FATAL_ERROR "Cannot activate both model-checking and NS3 bindings: NS3 pull too much dependencies for the MC to work")
+endif()
+
if(enable_smpi)
include(FindGFortran)
SET(HAVE_SMPI 1)
if(enable_smpi)
include(FindGFortran)
SET(HAVE_SMPI 1)