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 git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
ab7cb25
..
978d2d0
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-14,11
+14,11
@@
set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
# 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
# 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
-# 3.7.
0
+# 3.7.
{0,1} -> release 3.7, 3.7.1
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "7")
set(SIMGRID_VERSION_MAJOR "3")
set(SIMGRID_VERSION_MINOR "7")
-set(SIMGRID_VERSION_PATCH "
0
")
+set(SIMGRID_VERSION_PATCH "
1
")
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
if(${SIMGRID_VERSION_PATCH} EQUAL "0")
set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
@@
-158,12
+158,15
@@
if(WIN32)
if(ARCH_32_BITS) ### Arch 32bits
set(_WIN32 1)
if(ARCH_32_BITS) ### Arch 32bits
set(_WIN32 1)
- set(NSIS_WIN_VERSION "win32")
else(ARCH_32_BITS) ### Arch 64bits
set(_WIN64 1)
else(ARCH_32_BITS) ### Arch 64bits
set(_WIN64 1)
- set(NSIS_WIN_VERSION "win64")
endif(ARCH_32_BITS)
endif(ARCH_32_BITS)
+ set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITEW6432})
+ if(NSIS_WIN_VERSION MATCHES "")
+ set(NSIS_WIN_VERSION $ENV{PROCESSOR_ARCHITECTURE})
+ endif(NSIS_WIN_VERSION MATCHES "")
+ string(TOLOWER ${NSIS_WIN_VERSION} NSIS_WIN_VERSION)
set(_XBT_WIN32 1)
set(_XBT_WIN32 1)
@@
-226,10
+229,13
@@
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
### Pipol compilation
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
### Pipol compilation
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
-if(NOT WIN32)
### Build the doc
### Build the doc
+if(NOT WIN32)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
+else(NOT WIN32)
+include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake)
endif(NOT WIN32)
endif(NOT WIN32)
+
### Print ARGS
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)
### Print ARGS
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)