X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3b31935dbb982efedcba73632709bd889016dbdb..02c92b4fc661c4b78af42dbb23327f41ad326e13:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f136823f55..aa4fb63171 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,24 +136,7 @@ if(WIN32)
     string(REGEX REPLACE "/bin/gcc.*" "/include"  CMAKE_INCLUDE_WIN "${CMAKE_INCLUDE_WIN}")
     string(REGEX REPLACE "/bin/gcc.*" "/lib"  CMAKE_LIB_WIN "${CMAKE_LIB_WIN}")
     set(INCLUDES ${INCLUDES} ${CMAKE_INCLUDE_WIN})
-    
-    if(BORLAND)			### BORLAND COMPILER
-	    set(__BORLANDC__ 1)
-	    set(CMAKE_COMPILER_IS_GNUCC 0)
-	    set(MSVC 0)
-	    set(_XBT_BORLANDC_COMPILER 1)
-    endif(BORLAND)
-    
-    if(MSVC)	### MicroSoftVisualC COMPILER
-	    set(__VISUALC__ 1)
-	    set(BORLAND 0)
-	    set(CMAKE_COMPILER_IS_GNUCC 0)
-	    set(_XBT_VISUALC_COMPILER 1)
-	    set(_MSC_VER 1)
-        set(__STRICT_ANSI__ 1)
-        set(_M_IX86 1)
-    endif(MSVC)
-    
+        
     if(CMAKE_COMPILER_IS_GNUCC)
         set(__GNUC__ 1)
         exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION")
@@ -169,16 +152,21 @@ if(WIN32)
         endif(COMPILER_C_MINOR_VERSION)
         set(MSVC 0)
 	    set(BORLAND 0)
+    else(CMAKE_COMPILER_IS_GNUCC)
+        message(FATAL_ERROR "Please use MinGW to compile SimGrid!")
     endif(CMAKE_COMPILER_IS_GNUCC)
     
     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)
     
@@ -241,10 +229,13 @@ include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
 ### Pipol compilation
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
 
-if(NOT WIN32)
 ### Build the doc
+if(NOT WIN32)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake)
+else(NOT WIN32)
+include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/GenerateDocWin.cmake)  
 endif(NOT WIN32)
+
 ### Print ARGS
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)