X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49fc0ac613b4c5d87dcb0a02ca72a8107f64844a..392a563ed3be3ffdaaefbdad8c779f360b30fcda:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6aafb106f3..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)
     
@@ -221,9 +224,7 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
 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)