[Cmake-commits] CMake branch, next, updated. v3.1.0-1754-g1ed4ba2

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1ed4ba2ffb51eeeecfc2696136c2372b9a265577 (commit)
       via  7b7209f63579f701afb665c9542ada584ee64328 (commit)
      from  25cd19afe9a109912c2af3116553833e88aca036 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ed4ba2ffb51eeeecfc2696136c2372b9a265577
commit 1ed4ba2ffb51eeeecfc2696136c2372b9a265577
Merge: 25cd19a 7b7209f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 11 16:51:12 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 11 16:51:12 2015 -0500

    Merge topic 'xcode-ios-compiler-id' into next
    
    7b7209f6 Xcode: Do not require code signing for compiler id (#15214)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b7209f63579f701afb665c9542ada584ee64328
commit 7b7209f63579f701afb665c9542ada584ee64328
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 11 16:41:04 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Jan 11 16:50:39 2015 -0500

    Xcode: Do not require code signing for compiler id (#15214)
    
    The approach in commit v3.1.0-rc1~1^2 (Xcode: Fix compiler id detection
    when code signing is required, 2014-10-22) still requires a code signing
    key when targeting a real device.  Instead set CODE_SIGNING_REQUIRED to
    "NO" to tell Xcode not to sign at all.  Drop the corresponding setting
    of the code signing identity.

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@

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake