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 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
ae43da2
..
4991906
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-7,10
+7,14
@@
project(simgrid CXX C)
set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
-### Version 3.5.99, aka 3.6 svn
+## Mapping version number -> version name
+# 3.5.99 -> alpha1 (oops)
+# 3.5.91 -> beta1
+# 3.5.92 -> beta2
+### Version 3.5.91, aka 3.6 beta1
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "5")
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "5")
-set(SIMGRID_VERSION_PATCH "9
9
")
+set(SIMGRID_VERSION_PATCH "9
2
")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
set(libsimgrid_version "${release_version}")
set(libgras_version "${release_version}")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
set(libsimgrid_version "${release_version}")
set(libgras_version "${release_version}")