X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51127994e0f96d0667dd433a801a47a46f50eae7..0f5b8a5a093ac03c50b83a1ba1b1f314b078188d:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6a66185ab..1bcfc59684 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,13 +159,6 @@ if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
   set(INCLUDES ${INCLUDES} /usr/include/)
 endif()
 
-### Check 32bits or 64bits
-IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  SET(ARCH_32_BITS 1)
-ELSE()
-  SET(ARCH_32_BITS 0)
-ENDIF()
-
 if(WIN32)
   set(CMAKE_INCLUDE_WIN "${CMAKE_C_COMPILER}")
   set(CMAKE_LIB_WIN "${CMAKE_C_COMPILER}")
@@ -184,7 +177,7 @@ set(SIMGRID_DEP "-lm")
 set(HAVE_RAW_CONTEXTS 0)
 include(CMakeDetermineSystem)
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
-  IF(${ARCH_32_BITS})
+  IF(CMAKE_SIZEOF_VOID_P EQUAL 4) # 32 bits
     message(STATUS "System processor: i686 (${CMAKE_SYSTEM_PROCESSOR}, 32 bits)")
     set(PROCESSOR_i686 1)
     set(PROCESSOR_x86_64 0)
@@ -382,7 +375,6 @@ endif()
 if(enable_model-checking AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux")
   message(WARNING "Support for model-checking has not been enabled on ${CMAKE_SYSTEM}: disabling it")
   set(enable_model-checking FALSE)
-  set(HAVE_MC 0)
 endif()
 
 if(enable_model-checking)
@@ -392,6 +384,7 @@ if(enable_model-checking)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
 else()
   SET(HAVE_MC 0)  
+  set(HAVE_MMALLOC 0)
 endif()
 
 if (enable_model-checking AND enable_ns3)