Skip to content

Check the CPU architecture to build Lima on ARM64 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Check the CPU architecture to build Lima on ARM64 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cmake/workarounds.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion src/Lima/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down