diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-22 13:57:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-22 14:16:07 (GMT) |
| commit | b91020f659ddc7d50868b3face370d9221c4c2dd (patch) | |
| tree | 54822059b5274219f46cfe7d57e324832751aa10 /Modules | |
| parent | c48f6e1229b2487f98426eeced5da069a70efbf5 (diff) | |
| download | CMake-b91020f659ddc7d50868b3face370d9221c4c2dd.zip CMake-b91020f659ddc7d50868b3face370d9221c4c2dd.tar.gz CMake-b91020f659ddc7d50868b3face370d9221c4c2dd.tar.bz2 | |
Xcode: Fix compiler id detection when code signing is required
The iOS product type 'com.apple.package-type.bundle.unit-test' requires
code signing on Xcode 6. Other iOS target types do too. Until CMake
learns to add the CODE_SIGN_IDENTITY build attribute itself, toolchain
files can set CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY to tell the Xcode
generator to add the attribute. Teach CMakeDetermineCompilerId to
recognize this variable and add the CODE_SIGN_IDENTITY build attribute
to the compiler id project.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 5 | ||||
| -rw-r--r-- | Modules/CompilerId/Xcode-3.pbxproj.in | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 77c4365..613f4b3 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -270,6 +270,11 @@ Id flags: ${testflags} else() set(id_sdkroot "") endif() + if(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() if(NOT ${XCODE_VERSION} VERSION_LESS 3) set(v 3) set(ext xcodeproj) diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in index cceffa0..aebae27 100644 --- a/Modules/CompilerId/Xcode-3.pbxproj.in +++ b/Modules/CompilerId/Xcode-3.pbxproj.in @@ -81,6 +81,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ONLY_ACTIVE_ARCH = YES; + @id_code_sign_identity@ CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; SYMROOT = .; @id_toolset@ |