From dff323de361d452745945f08bec1903414feaeeb Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 28 Sep 2021 16:14:00 +0200
Subject: [PATCH] Patch 1 from Frederic Picca: detect 64bit and x86 separately
---
cmake/BornAgain/Linux.cmake | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/cmake/BornAgain/Linux.cmake b/cmake/BornAgain/Linux.cmake
index 2f482eea000..98f67a52193 100644
--- a/cmake/BornAgain/Linux.cmake
+++ b/cmake/BornAgain/Linux.cmake
@@ -1,14 +1,13 @@
set(BORNAGAIN_ARCHITECTURE linux)
set(BORNAGAIN_PLATFORM linux)
-execute_process(COMMAND uname -m OUTPUT_VARIABLE SYSCTL_OUTPUT)
-if(${SYSCTL_OUTPUT} MATCHES x86_64)
+if(CMAKE_SIZEOF_VOID_P GREATER 4)
message(STATUS "Found a 64bit system")
- set(BIT_ENVIRONMENT "-m64")
- set(BORNAGAIN_ARCHITECTURE linuxx8664)
+ if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
+ set(BORNAGAIN_ARCHITECTURE linuxx8664)
+ endif()
else()
message(STATUS "Found a 32bit system")
- set(BIT_ENVIRONMENT "-m32")
add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY=1)
endif()
--
GitLab