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_os_thread module public (Java needs it, at least)
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 10b14d897f554c67f9174b32c1f6c989b5b317e3..aa4fb63171e137294e9b325a9138745601517ba7 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)
@@
-233,9
+236,6
@@
else(NOT WIN32)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake)
endif(NOT WIN32)
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake)
endif(NOT WIN32)
-### Print NbCore
-include(FindNbCore)
-
### Print ARGS
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)
### Print ARGS
include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)