summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-08-27 17:54:36 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-08-27 17:54:44 (GMT)
commit92de93b97486ae93fd73829c8d69e6401858acd3 (patch)
treeb34d2dcba81cea876ac5fdc18bd555639054bdf8 /Modules
parent74b9538c2661f406e25dad364faf0cf7a7dbda84 (diff)
parentc68b358ce3c4eb132e7c6dd24effa83ce58a0bb9 (diff)
downloadCMake-92de93b97486ae93fd73829c8d69e6401858acd3.zip
CMake-92de93b97486ae93fd73829c8d69e6401858acd3.tar.gz
CMake-92de93b97486ae93fd73829c8d69e6401858acd3.tar.bz2
Merge topic 'xcode-compiler-id-sign-identity'
c68b358ce3 Xcode: Set CODE_SIGN_IDENTITY during compiler identification Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Gregor Jasny <gjasny@googlemail.com> Merge-request: !2299
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeDetermineCompilerId.cmake6
-rw-r--r--Modules/CompilerId/Xcode-3.pbxproj.in1
2 files changed, 7 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 16dde65..dc4d9be 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -355,6 +355,12 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
else()
set(id_development_team "")
endif()
+ if(DEFINED CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY)
+ set(id_code_sign_identity
+ "CODE_SIGN_IDENTITY = \"${CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY}\";")
+ else()
+ set(id_code_sign_identity "")
+ endif()
configure_file(${CMAKE_ROOT}/Modules/CompilerId/Xcode-3.pbxproj.in
${id_dir}/CompilerId${lang}.xcodeproj/project.pbxproj @ONLY)
unset(_ENV_MACOSX_DEPLOYMENT_TARGET)
diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in
index 94bcbf8..4686b64 100644
--- a/Modules/CompilerId/Xcode-3.pbxproj.in
+++ b/Modules/CompilerId/Xcode-3.pbxproj.in
@@ -73,6 +73,7 @@
isa = XCBuildConfiguration;
buildSettings = {
@id_development_team@
+ @id_code_sign_identity@
PRODUCT_NAME = CompilerId@id_lang@;
};
name = Debug;