kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'xcode-ios-compiler-id' into release

Browse Source
This commit is contained in:
Brad King 2015-01-12 09:01:18 -05:00
commit ddca664a08
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/CMakeDetermineCompilerId.cmake
View File

@ -270,11 +270,6 @@ Id flags: ${testflags}
else() else()
set(id_sdkroot "") set(id_sdkroot "")
endif() 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) if(NOT ${XCODE_VERSION} VERSION_LESS 3)
set(v 3) set(v 3)
set(ext xcodeproj) set(ext xcodeproj)

2
Modules/CompilerId/Xcode-3.pbxproj.in
View File

@ -81,7 +81,7 @@
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
@id_code_sign_identity@ CODE_SIGNING_REQUIRED = NO;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
SYMROOT = .; SYMROOT = .;
@id_toolset@ @id_toolset@