Skip to content

Commit 5892d38

Browse files
committed
[CMake] Check the cpu arch to build Lima with Icem on AMD64 only
1 parent ad9ee65 commit 5892d38

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

cmake/workarounds.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ endif (CCC_OS_FOUND)
1616
if (NOT PLATFORM)
1717
execute_process (COMMAND lsb_release -d COMMAND awk "{print $2;}" OUTPUT_VARIABLE PLATFORM OUTPUT_STRIP_TRAILING_WHITESPACE)
1818
endif (NOT PLATFORM)
19+
20+
# On récupère l'architecture du processeur.
21+
execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_TYPE OUTPUT_STRIP_TRAILING_WHITESPACE)
22+
1923
message ("PLATFORM=" ${PLATFORM})
24+
message ("PROC_TYPE=" ${PROC_TYPE})
2025
message ("LANGUAGES=" ${LANGUAGES})
2126
message ("CXX=" ${CXX})
2227
message ("CMAKE_CXX_COMPILER=" ${CMAKE_CXX_COMPILER})

src/Lima/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ file (GLOB PRIVATE_HEADERS public/LimaP/*.h)
3030
file (GLOB CPP_SOURCES *.cpp *.f90)
3131

3232
set (ICEM_SUPPORTED OFF)
33-
if ((PLATFORM STREQUAL "CentOS") OR (PLATFORM STREQUAL "Atos_7__x86_64") OR (PLATFORM STREQUAL "Atos_7__mic") OR (PLATFORM STREQUAL "RedHat-7-x86_64") OR (PLATFORM STREQUAL "Rhel_8__x86_64") OR (PLATFORM STREQUAL "RedHat-8-x86_64") OR (PLATFORM STREQUAL "Ubuntu"))
33+
if ((PROC_TYPE STREQUAL "x86_64") AND ((PLATFORM STREQUAL "CentOS") OR (PLATFORM STREQUAL "Atos_7__x86_64") OR (PLATFORM STREQUAL "Atos_7__mic") OR (PLATFORM STREQUAL "RedHat-7-x86_64") OR (PLATFORM STREQUAL "Rhel_8__x86_64") OR (PLATFORM STREQUAL "RedHat-8-x86_64") OR (PLATFORM STREQUAL "Ubuntu")))
3434
message (STATUS "======================> Ajout du support du format ICEM-CFD")
3535
file (GLOB ICEMCFD_OBJS ../icemcfd/RHEL_4__x86_64/*.o)
3636
set (ICEMCFD_FLAGS "__INTERNE_ICEMCFD")

0 commit comments

Comments
 (0)