Browse Source

Merge topic 'xcode11-bundles'

e29a92f525 Xcode: Make BundleTests compatible with Xcode 11

Acked-by: Kitware Robot <[email protected]>
Merge-request: !3767
Brad King 6 years ago
parent
commit
aa3465fcd2

+ 5 - 1
Tests/BundleTest/BundleSubDir/CMakeLists.txt

@@ -35,7 +35,11 @@ install(TARGETS SecondBundle DESTINATION Applications)
 # installed into a location that uses this output name this will fail if the
 # installed into a location that uses this output name this will fail if the
 # bundle does not respect the name.  Also the executable will not be found by
 # bundle does not respect the name.  Also the executable will not be found by
 # the test driver if this does not work.
 # the test driver if this does not work.
-set_target_properties(SecondBundle PROPERTIES OUTPUT_NAME SecondBundleExe)
+set_target_properties(SecondBundle PROPERTIES
+  OUTPUT_NAME SecondBundleExe
+  XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ""
+  XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO"
+  )
 
 
 # Express one app bundle in terms of another's SOURCES to verify that
 # Express one app bundle in terms of another's SOURCES to verify that
 # the generators do not expose the Info.plist of one to the other.
 # the generators do not expose the Info.plist of one to the other.

+ 5 - 1
Tests/BundleTest/CMakeLists.txt

@@ -56,7 +56,11 @@ install(TARGETS BundleTest DESTINATION Applications)
 # installed into a location that uses this output name this will fail if the
 # installed into a location that uses this output name this will fail if the
 # bundle does not respect the name.  Also the executable will not be found by
 # bundle does not respect the name.  Also the executable will not be found by
 # the test driver if this does not work.
 # the test driver if this does not work.
-set_target_properties(BundleTest PROPERTIES OUTPUT_NAME BundleTestExe)
+set_target_properties(BundleTest PROPERTIES
+  OUTPUT_NAME BundleTestExe
+  XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ""
+  XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO"
+  )
 
 
 # Test executable versioning if it is supported.
 # Test executable versioning if it is supported.
 if(NOT XCODE)
 if(NOT XCODE)

+ 2 - 0
Tests/CFBundleTest/CMakeLists.txt

@@ -50,6 +50,8 @@ set_source_files_properties(
 set_target_properties(CFBundleTest PROPERTIES
 set_target_properties(CFBundleTest PROPERTIES
     BUNDLE 1
     BUNDLE 1
     BUNDLE_EXTENSION plugin
     BUNDLE_EXTENSION plugin
+    XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ""
+    XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO"
     XCODE_ATTRIBUTE_MACH_O_TYPE mh_bundle
     XCODE_ATTRIBUTE_MACH_O_TYPE mh_bundle
     XCODE_ATTRIBUTE_INFOPLIST_FILE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
     XCODE_ATTRIBUTE_INFOPLIST_FILE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
     MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
     MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist