summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-11-13 14:40:01 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-11-13 14:40:09 (GMT)
commit5ba755996622d2a955b3e276006ad61fb4d29202 (patch)
tree570c0bbca18df26c1aa61c761c2e0206819e4cb6 /Modules
parent8b8f0197eb48fcc632f582cd70b2dd03f3e48878 (diff)
parent98849039ccaf2db810abdeb4cf570cef68711642 (diff)
downloadCMake-5ba755996622d2a955b3e276006ad61fb4d29202.zip
CMake-5ba755996622d2a955b3e276006ad61fb4d29202.tar.gz
CMake-5ba755996622d2a955b3e276006ad61fb4d29202.tar.bz2
Merge topic 'xcode-compiler-id-arch'
98849039cc Xcode: Default to arm64 arch on Apple Silicon hosts during compiler id Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5505
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeDetermineCompilerId.cmake9
-rw-r--r--Modules/CompilerId/Xcode-3.pbxproj.in2
2 files changed, 9 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 688e1d8..d907926 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -516,9 +516,16 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT MATCHES "^$|[Mm][Aa][Cc][Oo][Ss]")
# When targeting macOS, use only the host architecture.
- set(id_archs [[ARCHS = "$(NATIVE_ARCH_ACTUAL)";]])
+ if (_CMAKE_APPLE_ARCHS_DEFAULT)
+ set(id_archs "ARCHS = \"${_CMAKE_APPLE_ARCHS_DEFAULT}\";")
+ set(id_arch_active "ONLY_ACTIVE_ARCH = NO;")
+ else()
+ set(id_archs [[ARCHS = "$(NATIVE_ARCH_ACTUAL)";]])
+ set(id_arch_active "ONLY_ACTIVE_ARCH = YES;")
+ endif()
else()
set(id_archs "")
+ set(id_arch_active "ONLY_ACTIVE_ARCH = YES;")
endif()
configure_file(${CMAKE_ROOT}/Modules/CompilerId/Xcode-3.pbxproj.in
${id_dir}/CompilerId${lang}.xcodeproj/project.pbxproj @ONLY)
diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in
index 6fe17e5..aab357a 100644
--- a/Modules/CompilerId/Xcode-3.pbxproj.in
+++ b/Modules/CompilerId/Xcode-3.pbxproj.in
@@ -80,11 +80,11 @@
1DEB928A08733DD80010E9CD = {
isa = XCBuildConfiguration;
buildSettings = {
- ONLY_ACTIVE_ARCH = YES;
CODE_SIGNING_REQUIRED = NO;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
SYMROOT = .;
@id_archs@
+ @id_arch_active@
@id_toolset@
@id_lang_version@
@id_clang_cxx_library@