X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/86a467649debb3f88b1766acb97631bd172b7e96..dda9405f7ee3f80c4b9c225117d08ec734f2a0f8:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab7004ea06..d5afc0abda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,16 +8,18 @@ project(SimGrid CXX C)
 set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
+set(CMAKE_C_LINK_FLAGS "" CACHE TYPE INTERNAL FORCE)
 
 ## Mapping version number -> version name
 # 3.5.99 -> alpha1 (oops)
 # 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
+# 3.8.0 -> release 3.8
 
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "7")
+set(SIMGRID_VERSION_MINOR "8")
 set(SIMGRID_VERSION_PATCH "0")
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
@@ -163,6 +165,9 @@ if(WIN32)
     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)