diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-12 14:01:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-12 14:01:18 (GMT) |
| commit | ddca664a08a1908a617657d65aaf8c442f2af793 (patch) | |
| tree | dd5438e20de7e4a77816050c3d267587baacbd94 /Modules | |
| parent | f3ad57d25e293f84205d74b40744301f65f472e8 (diff) | |
| parent | 7b7209f63579f701afb665c9542ada584ee64328 (diff) | |
| download | CMake-ddca664a08a1908a617657d65aaf8c442f2af793.zip CMake-ddca664a08a1908a617657d65aaf8c442f2af793.tar.gz CMake-ddca664a08a1908a617657d65aaf8c442f2af793.tar.bz2 | |
Merge branch 'xcode-ios-compiler-id' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 5 | ||||
| -rw-r--r-- | Modules/CompilerId/Xcode-3.pbxproj.in | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 6c6a914..47d351a 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -270,11 +270,6 @@ 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 aebae27..7f686a2 100644 --- a/Modules/CompilerId/Xcode-3.pbxproj.in +++ b/Modules/CompilerId/Xcode-3.pbxproj.in @@ -81,7 +81,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ONLY_ACTIVE_ARCH = YES; - @id_code_sign_identity@ + CODE_SIGNING_REQUIRED = NO; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; SYMROOT = .; @id_toolset@ |