diff --git a/cmake/workarounds.cmake b/cmake/workarounds.cmake index 47478ec..bf59fc7 100644 --- a/cmake/workarounds.cmake +++ b/cmake/workarounds.cmake @@ -16,7 +16,12 @@ endif (CCC_OS_FOUND) if (NOT PLATFORM) execute_process (COMMAND lsb_release -d COMMAND awk "{print $2;}" OUTPUT_VARIABLE PLATFORM OUTPUT_STRIP_TRAILING_WHITESPACE) endif (NOT PLATFORM) + +# On récupère l'architecture du processeur. +execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_TYPE OUTPUT_STRIP_TRAILING_WHITESPACE) + message ("PLATFORM=" ${PLATFORM}) +message ("PROC_TYPE=" ${PROC_TYPE}) message ("LANGUAGES=" ${LANGUAGES}) message ("CXX=" ${CXX}) message ("CMAKE_CXX_COMPILER=" ${CMAKE_CXX_COMPILER}) diff --git a/src/Lima/CMakeLists.txt b/src/Lima/CMakeLists.txt index 2b0649b..2cd05a9 100644 --- a/src/Lima/CMakeLists.txt +++ b/src/Lima/CMakeLists.txt @@ -30,7 +30,7 @@ file (GLOB PRIVATE_HEADERS public/LimaP/*.h) file (GLOB CPP_SOURCES *.cpp *.f90) set (ICEM_SUPPORTED OFF) -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")) +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"))) message (STATUS "======================> Ajout du support du format ICEM-CFD") file (GLOB ICEMCFD_OBJS ../icemcfd/RHEL_4__x86_64/*.o) set (ICEMCFD_FLAGS "__INTERNE_ICEMCFD")