X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78dddc6895e9f6b17959649407e33d82129be7aa..1afd0358e32467f6e33a233e16355a26e21215c4:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10b14d897f..aa4fb63171 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,12 +158,15 @@ if(WIN32)
     
     if(ARCH_32_BITS)	### Arch 32bits
         set(_WIN32 1)
-        set(NSIS_WIN_VERSION "win32")
     else(ARCH_32_BITS)	### Arch 64bits
         set(_WIN64 1)
-        set(NSIS_WIN_VERSION "win64")
     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)
     
@@ -233,9 +236,6 @@ else(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)