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
Need those files to make dist
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
6aafb10
..
aa4fb63
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-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)
@@
-221,9
+224,7
@@
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
### Setup the distrib
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
### Setup the distrib
-if(NOT WIN32)
- include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
-endif(NOT WIN32)
+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)