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
3.6 rc3
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
4991906
..
f48d694
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-9,12
+9,13
@@
set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
## Mapping version number -> version name
# 3.5.99 -> alpha1 (oops)
set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
## 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
+# 3.5.9{1,2} -> beta{1,2}
+# 3.5.9{3,4,5} -> rc{1,2,3}
+
+# 3.6.0 -> release 3.6 (not yet)
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
2
")
+set(SIMGRID_VERSION_PATCH "9
5
")
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}")
@@
-23,7
+24,6
@@
set(GCC_NEED_VERSION "4.0")
### SET THE LIBRARY EXTENSION AND GCC VERSION
if(APPLE) #MAC
### SET THE LIBRARY EXTENSION AND GCC VERSION
if(APPLE) #MAC
- set(GCC_NEED_VERSION "4.5")
set(LIB_EXE "dylib")
else(APPLE)
if(WIN32) #WINDOWS
set(LIB_EXE "dylib")
else(APPLE)
if(WIN32) #WINDOWS