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
Make xbt_strbuff_chomp() really do its work.
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
360d5d4
..
a859a2c
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-7,23
+7,35
@@
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.91, aka 3.6 beta1
+
+## Mapping version number -> version name
+# 3.5.99 -> alpha1 (oops)
+# 3.5.9{1,2} -> beta{1,2}
+# 3.5.9{3,4,5} -> rc{1,2,3}
+# 3.6.{0,1,2} -> release 3.6, 3.6.1, 3.6.2
+
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "5")
-set(SIMGRID_VERSION_PATCH "91")
-set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
+set(SIMGRID_VERSION_MINOR "6")
+set(SIMGRID_VERSION_PATCH "2")
+
+if(${SIMGRID_VERSION_PATCH} EQUAL "0")
+ set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
+else(${SIMGRID_VERSION_PATCH} EQUAL "0")
+ set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}")
+endif(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(libsimgrid_version "${release_version}")
set(libgras_version "${release_version}")
set(libsmpi_version "${release_version}")
set(GCC_NEED_VERSION "4.0")
set(libsimgrid_version "${release_version}")
set(libgras_version "${release_version}")
set(libsmpi_version "${release_version}")
set(GCC_NEED_VERSION "4.0")
+set(APPLE_NEED_GCC_VERSION "4.6")
### 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 "a")
set(LIB_EXE "dylib")
else(APPLE)
if(WIN32) #WINDOWS
set(LIB_EXE "a")
+ set(BIN_EXE ".exe")
else(WIN32) #UNIX
set(LIB_EXE "so")
endif(WIN32)
else(WIN32) #UNIX
set(LIB_EXE "so")
endif(WIN32)
@@
-107,12
+119,12
@@
endif(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
### Check 32bits or 64bits
INCLUDE (CheckTypeSize)
### Check 32bits or 64bits
INCLUDE (CheckTypeSize)
-CHECK_TYPE_SIZE("
long" SIZEOF_LONG
)
-IF(SIZEOF_
LONG
EQUAL 4)
+CHECK_TYPE_SIZE("
void*" SIZEOF_VOIDSTAR
)
+IF(SIZEOF_
VOIDSTAR
EQUAL 4)
SET(ARCH_32_BITS 1)
SET(ARCH_32_BITS 1)
-ELSE(SIZEOF_
LONG
EQUAL 4)
+ELSE(SIZEOF_
VOIDSTAR
EQUAL 4)
SET(ARCH_32_BITS 0)
SET(ARCH_32_BITS 0)
-ENDIF(SIZEOF_
LONG
EQUAL 4)
+ENDIF(SIZEOF_
VOIDSTAR
EQUAL 4)
if(WIN32)
if(WIN32)