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
Merge branch 'mc' into mc++
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
31167ab
..
747d9fc
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-4,7
+4,7
@@
if(WIN32)
SET(CMAKE_RC_COMPILER "windres")
endif()
project(SimGrid C)
SET(CMAKE_RC_COMPILER "windres")
endif()
project(SimGrid C)
-if (enable_gtnets OR enable_ns3)
+if (enable_gtnets OR enable_ns3
OR enable_model-checking
)
enable_language(CXX)
endif()
if (NOT DEFINED enable_smpi OR enable_smpi) # smpi is enabled by default
enable_language(CXX)
endif()
if (NOT DEFINED enable_smpi OR enable_smpi) # smpi is enabled by default
@@
-51,7
+51,7
@@
set(CMAKE_Fortran_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "10")
set(SIMGRID_VERSION_PATCH "0")
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "10")
set(SIMGRID_VERSION_PATCH "0")
-set(SIMGRID_VERSION_EXTRA "-rc
1
") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_EXTRA "-rc
2
") # Extra words to add to version string (e.g. -rc1)
set(SIMGRID_VERSION_DATE "2013") # Year for copyright information
set(SIMGRID_VERSION_DATE "2013") # Year for copyright information