From: Navarrop <Pierre.Navarro@imag.fr>
Date: Thu, 23 Jun 2011 13:02:09 +0000 (+0200)
Subject: Fix detection of amd64 arch on mac.
X-Git-Tag: v3_6_1~18
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/58dd63caceb0776f540d49648f15ab21264fa4d0

Fix detection of amd64 arch on mac.
---

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 6722cab45f..c9e69de800 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -9,55 +9,7 @@ if(enable_smpi AND NOT WIN32)
 	exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE "OKITOKI")
 	exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI")
 endif(enable_smpi AND NOT WIN32)
-
-
-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-   message(STATUS "System processor: amd64")
-   set(HAVE_RAWCTX 1)
-   
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i386$")
-    message(STATUS "System processor: i386")
-    
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i686$")
-    message(STATUS "System processor: i686")
-    set(HAVE_RAWCTX 1)
-    
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
-    message(STATUS "System processor: alpha")
-    
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-    # Subdir is "arm" for both big-endian (arm) and little-endian (armel).
-    message(STATUS "System processor: arm")
-    
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
-    # mips* machines are bi-endian mostly so processor does not tell
-    # endianess of the underlying system.
-    message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
-    
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
-    message(STATUS "System processor: ppc64")
-    
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
-    message(STATUS "System processor: ppc")
-    
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
-    # Both flavours can run on the same processor
-    message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9")
-    
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)")
-    message(STATUS "System processor: parisc" "parisc64")
-    
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390")
-    # s390 binaries can run on s390x machines
-    message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x")
-    
-ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh")
-    message(STATUS "System processor: sh")
-    
-ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") #PROCESSOR NOT FOUND
-    message(STATUS "PROCESSOR NOT FOUND: ${CMAKE_SYSTEM_PROCESSOR}")
-    
-ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+       
        
 ### For code coverage
 ### Set some variables
diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 2cea4e2c31..b63317412a 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -3,6 +3,57 @@ ${CMAKE_MODULE_PATH}
 ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Modules
 )
 
+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+   message(STATUS "System processor: amd64")
+   set(HAVE_RAWCTX 1)
+   
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
+    IF(${ARCH_32_BITS})
+        message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}")
+    ELSE(${ARCH_32_BITS})
+        message(STATUS "System processor: amd64")
+        set(PROCESSOR_x86_64 true)
+        set(PROCESSOR_i686 false)
+    ENDIF(${ARCH_32_BITS})          
+    set(HAVE_RAWCTX 1)
+    
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
+    message(STATUS "System processor: alpha")
+    
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+    # Subdir is "arm" for both big-endian (arm) and little-endian (armel).
+    message(STATUS "System processor: arm")
+    
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+    # mips* machines are bi-endian mostly so processor does not tell
+    # endianess of the underlying system.
+    message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
+    
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
+    message(STATUS "System processor: ppc64")
+    
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+    message(STATUS "System processor: ppc")
+    
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
+    # Both flavours can run on the same processor
+    message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9")
+    
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)")
+    message(STATUS "System processor: parisc" "parisc64")
+    
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390")
+    # s390 binaries can run on s390x machines
+    message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x")
+    
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh")
+    message(STATUS "System processor: sh")
+    
+ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") #PROCESSOR NOT fIND
+    message(STATUS "PROCESSOR NOT FOUND: ${CMAKE_SYSTEM_PROCESSOR}")
+    
+ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+
 message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
 
 include(CheckFunctionExists)