X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aad6b6c4c7b1454dd284f822ba6f52e790f42c6e..4127fe802ff334591a6ba5b315190523fc2a660e:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a57c58c4ca..96b38db6c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ else()
 endif()
 
 if(WIN32 OR MINGW)
-  message(FATAL "SimGrid does not build on native windows, nor with MinGW. Please use WSL2 instead.")
+  message(FATAL_ERROR "SimGrid does not build on native windows, nor with MinGW. Please use WSL2 instead.")
 endif()
 
 message(STATUS "Configuring SimGrid v${release_version}")
@@ -162,7 +162,6 @@ include_directories(
 set(INTERNAL_INCLUDES
   ${CMAKE_BINARY_DIR}
   ${CMAKE_HOME_DIRECTORY}
-  ${CMAKE_HOME_DIRECTORY}/src/include
   )
 
 if(enable_smpi)
@@ -179,14 +178,15 @@ set(SIMGRID_DEP "-lm")
 ### Determine the assembly flavor that we need today
 set(HAVE_RAW_CONTEXTS 0)
 include(CMakeDetermineSystem)
+foreach(arch i686 x86_64 arm64)
+  set(SIMGRID_PROCESSOR_${arch} 0)
+endforeach()
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
   IF(CMAKE_SIZEOF_VOID_P EQUAL 4) # 32 bits
     message(STATUS "System processor: i686 (${CMAKE_SYSTEM_PROCESSOR}, 32 bits)")
     set(SIMGRID_PROCESSOR_i686 1)
-    set(SIMGRID_PROCESSOR_x86_64 0)
   ELSE()
     message(STATUS "System processor: x86_64 (${CMAKE_SYSTEM_PROCESSOR}, 64 bits)")
-    set(SIMGRID_PROCESSOR_i686 0)
     set(SIMGRID_PROCESSOR_x86_64 1)
   ENDIF()
   if(CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
@@ -194,9 +194,11 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
   else()
     set(HAVE_RAW_CONTEXTS 1)
   endif()
+ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
+  message(STATUS "System processor: arm64 (${CMAKE_SYSTEM_PROCESSOR}, 64 bits)")
+  set(SIMGRID_PROCESSOR_arm64 1)
 ELSE()
-  set(SIMGRID_PROCESSOR_i686 0)
-  set(SIMGRID_PROCESSOR_x86_64 0)
+  message(STATUS "System processor (${CMAKE_SYSTEM_PROCESSOR}) not explicitly accounted for")
 ENDIF()
 
 include(CheckFunctionExists)
@@ -580,7 +582,6 @@ set(generated_files_to_clean
   ${CMAKE_BINARY_DIR}/bin/smpiff
   ${CMAKE_BINARY_DIR}/bin/smpif90
   ${CMAKE_BINARY_DIR}/bin/smpirun
-  ${CMAKE_BINARY_DIR}/bin/colorize
   ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml
   ${CMAKE_BINARY_DIR}/examples/smpi/tracing/smpi_traced.trace
   )