X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2696e7d1bca082a983f1887ba14f90543f2cd173..dbb6a5398ebdb917f1de3acc0d16cd83cd23de71:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f48d694648..aa4fb63171 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,24 +3,33 @@ cmake_minimum_required(VERSION 2.6)
 if(WIN32)
     SET(CMAKE_RC_COMPILER "windres")
 endif(WIN32)
-project(simgrid CXX C)
+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)
+
 ## 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.6.0 -> release 3.6 (not yet)
 set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "5")
-set(SIMGRID_VERSION_PATCH "95")
-set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
+set(SIMGRID_VERSION_MINOR "7")
+set(SIMGRID_VERSION_PATCH "0")
+
+if(${SIMGRID_VERSION_PATCH} EQUAL "0")
+	set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
+else(${SIMGRID_VERSION_PATCH} EQUAL "0")
+	set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}")
+endif(${SIMGRID_VERSION_PATCH} EQUAL "0")
 set(libsimgrid_version "${release_version}")
 set(libgras_version "${release_version}")
 set(libsmpi_version "${release_version}")
 set(GCC_NEED_VERSION "4.0")
+set(APPLE_NEED_GCC_VERSION "4.6")
 
 ### SET THE LIBRARY EXTENSION AND GCC VERSION
 if(APPLE) #MAC
@@ -28,6 +37,7 @@ if(APPLE) #MAC
 else(APPLE)
     if(WIN32) #WINDOWS
         set(LIB_EXE "a")
+        set(BIN_EXE ".exe")
     else(WIN32) #UNIX
 	    set(LIB_EXE "so")
     endif(WIN32)
@@ -111,12 +121,12 @@ endif(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
 
 ### Check 32bits or 64bits
 INCLUDE (CheckTypeSize)
-CHECK_TYPE_SIZE("long" SIZEOF_LONG)
-IF(SIZEOF_LONG EQUAL 4)
+CHECK_TYPE_SIZE("void*" SIZEOF_VOIDSTAR)
+IF(SIZEOF_VOIDSTAR EQUAL 4)
   SET(ARCH_32_BITS 1)
-ELSE(SIZEOF_LONG EQUAL 4)
+ELSE(SIZEOF_VOIDSTAR EQUAL 4)
   SET(ARCH_32_BITS 0)
-ENDIF(SIZEOF_LONG EQUAL 4)
+ENDIF(SIZEOF_VOIDSTAR EQUAL 4)
 
 if(WIN32)
 
@@ -126,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")
@@ -159,6 +152,8 @@ 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
@@ -166,6 +161,12 @@ if(WIN32)
     else(ARCH_32_BITS)	### Arch 64bits
         set(_WIN64 1)
     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)
     
@@ -228,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)