Ver código fonte

Xcode: Completely disable code signing for compiler id detection

Issue: #17870
Gregor Jasny 7 anos atrás
pai
commit
e8ee8cab97

+ 2 - 0
Help/manual/cmake-toolchains.7.rst

@@ -564,6 +564,8 @@ code signing.  If the :generator:`Xcode` generator is being used and
 code signing is required or desired, the developmemt team ID can be
 code signing is required or desired, the developmemt team ID can be
 specified via the ``CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM`` CMake variable.
 specified via the ``CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM`` CMake variable.
 This team ID will then be included in the generated Xcode project.
 This team ID will then be included in the generated Xcode project.
+By default, CMake avoids the need for code signing during the internal
+configuration phase (i.e compiler ID and feature detection).
 
 
 .. _`Switching Between Device and Simulator`:
 .. _`Switching Between Device and Simulator`:
 
 

+ 0 - 12
Modules/CMakeDetermineCompilerId.cmake

@@ -358,18 +358,6 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
     else()
     else()
       set(id_sdkroot "")
       set(id_sdkroot "")
     endif()
     endif()
-    if(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM)
-      set(id_development_team
-        "DEVELOPMENT_TEAM = \"${CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM}\";")
-    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 "CODE_SIGN_IDENTITY = \"\";")
-    endif()
     configure_file(${CMAKE_ROOT}/Modules/CompilerId/Xcode-3.pbxproj.in
     configure_file(${CMAKE_ROOT}/Modules/CompilerId/Xcode-3.pbxproj.in
       ${id_dir}/CompilerId${lang}.xcodeproj/project.pbxproj @ONLY)
       ${id_dir}/CompilerId${lang}.xcodeproj/project.pbxproj @ONLY)
     unset(_ENV_MACOSX_DEPLOYMENT_TARGET)
     unset(_ENV_MACOSX_DEPLOYMENT_TARGET)

+ 1 - 2
Modules/CompilerId/Xcode-3.pbxproj.in

@@ -72,8 +72,7 @@
 		1DEB928608733DD80010E9CD = {
 		1DEB928608733DD80010E9CD = {
 			isa = XCBuildConfiguration;
 			isa = XCBuildConfiguration;
 			buildSettings = {
 			buildSettings = {
-				@id_development_team@
-				@id_code_sign_identity@
+				CODE_SIGN_IDENTITY = "";
 				PRODUCT_NAME = CompilerId@id_lang@;
 				PRODUCT_NAME = CompilerId@id_lang@;
 			};
 			};
 			name = Debug;
 			name = Debug;