A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Determine assembly flavor at a single place.
[simgrid.git]
/
buildtools
/
Cmake
/
CompleteInFiles.cmake
diff --git
a/buildtools/Cmake/CompleteInFiles.cmake
b/buildtools/Cmake/CompleteInFiles.cmake
index
4727446
..
319f8f0
100644
(file)
--- a/
buildtools/Cmake/CompleteInFiles.cmake
+++ b/
buildtools/Cmake/CompleteInFiles.cmake
@@
-7,16
+7,15
@@
set(CMAKE_MODULE_PATH
# x86
# i.86
# x86
# i.86
+### Determine the assembly flavor that we need today
+include(CMakeDetermineSystem)
IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86")
IF(${ARCH_32_BITS})
IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86")
IF(${ARCH_32_BITS})
+ message(STATUS "System processor: i686 (${CMAKE_SYSTEM_PROCESSOR}, 32 bits)")
set(PROCESSOR_i686 1)
set(PROCESSOR_i686 1)
- set(SIMGRID_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
- message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}")
ELSE()
ELSE()
- message(STATUS "System processor: amd64")
- set(SIMGRID_SYSTEM_PROCESSOR "amd64")
+ message(STATUS "System processor: x86_64 (${CMAKE_SYSTEM_PROCESSOR}, 64 bits)")
set(PROCESSOR_x86_64 1)
set(PROCESSOR_x86_64 1)
- set(PROCESSOR_i686 0)
ENDIF()
set(HAVE_RAWCTX 1)
ENDIF()
set(HAVE_RAWCTX 1)