summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-08-25 13:41:12 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-08-25 13:41:26 (GMT)
commit8708b41532a01479a96b2d5a67e54b7a1397306f (patch)
tree8b4af248ac163e7ab6f1ac71556302d176a8f8e2
parentc3977582b77f8b5a4ccacf460a262ff0a75d3cc5 (diff)
parentfa3c4b6dbfaa4eb1d666c1bea4c759d221b7ad98 (diff)
downloadCMake-8708b41532a01479a96b2d5a67e54b7a1397306f.zip
CMake-8708b41532a01479a96b2d5a67e54b7a1397306f.tar.gz
CMake-8708b41532a01479a96b2d5a67e54b7a1397306f.tar.bz2
Merge topic 'cxx-atomic' into release-3.27
fa3c4b6dbf Source: Link libatomic when needed on any Linux architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8756
-rw-r--r--Source/Checks/cm_cxx_features.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake
index 98d5eff..0262746 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -96,7 +96,7 @@ else()
set(CMake_HAVE_CXX_FILESYSTEM FALSE)
endif()
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l|sparc")
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|aarch64)$")
cm_check_cxx_feature(atomic_builtin)
if(NOT CMake_HAVE_CXX_ATOMIC_BUILTIN)
set(cm_check_cxx_feature_LINK_LIBRARIES atomic)