mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-11 20:11:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Remove explicit no-signing marks from BundleTest

Browse Source 
These were added by commit e29a92f525 (Xcode: Make BundleTests
compatible with Xcode 11, 2019-09-01, v3.16.0-rc1~158^2).  The
real problem is that the `.app` is constructed with text files
under the `.app/Contents/MacOS/` folder.  Move those, and drop
the special no-signing configuration.
This commit is contained in:
Brad King
2021-02-22 12:20:52 -05:00
parent 483db3de56
commit 8b22d9b3c3
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/BundleTest/BundleLib.cxx
View File

@@ -52,8 +52,8 @@ int foo(char* exec)
(void)br; (void)br;
int res1 = findBundleFile(exec, "Resources/randomResourceFile.plist"); int res1 = findBundleFile(exec, "Resources/randomResourceFile.plist");
int res2 = findBundleFile(exec, "MacOS/SomeRandomFile.txt"); int res2 = findBundleFile(exec, "Other/SomeRandomFile.txt");
int res3 = findBundleFile(exec, "MacOS/README.rst"); int res3 = findBundleFile(exec, "Other/README.rst");
if (!res1 || !res2 || !res3) { if (!res1 || !res2 || !res3) {
return 1; return 1;
} }

8
Tests/BundleTest/BundleSubDir/CMakeLists.txt
View File

@@ -16,7 +16,7 @@ set_source_files_properties(
"${BundleTest_SOURCE_DIR}/SomeRandomFile.txt" "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt"
"${BundleTest_SOURCE_DIR}/../../README.rst" "${BundleTest_SOURCE_DIR}/../../README.rst"
PROPERTIES PROPERTIES
MACOSX_PACKAGE_LOCATION MacOS MACOSX_PACKAGE_LOCATION Other
) )
add_executable(SecondBundle add_executable(SecondBundle
@@ -35,11 +35,7 @@ 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 set_target_properties(SecondBundle PROPERTIES OUTPUT_NAME SecondBundleExe)
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.

8
Tests/BundleTest/CMakeLists.txt
View File

@@ -19,7 +19,7 @@ set_source_files_properties(
SomeRandomFile.txt SomeRandomFile.txt
"${BundleTest_SOURCE_DIR}/../../README.rst" "${BundleTest_SOURCE_DIR}/../../README.rst"
PROPERTIES PROPERTIES
MACOSX_PACKAGE_LOCATION MacOS MACOSX_PACKAGE_LOCATION Other
) )
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/foobar") set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/foobar")
@@ -56,11 +56,7 @@ 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 set_target_properties(BundleTest PROPERTIES OUTPUT_NAME BundleTestExe)
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)