echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'bundle-exe-space-in-name'

Browse Source 
d3fd518c03 find_program: Properly decode URL for bundle exe name with spaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4891
This commit is contained in:
Brad King 2020-06-15 13:36:17 +00:00 committed by Kitware Robot
commit 148a5c2d42
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmFindProgramCommand.cxx
View File

@ -266,14 +266,13 @@ std::string cmFindProgramCommand::GetBundleExecutable(
if (executableURL != nullptr) {
const int MAX_OSX_PATH_SIZE = 1024;
char buffer[MAX_OSX_PATH_SIZE];
UInt8 buffer[MAX_OSX_PATH_SIZE];
// Convert the CFString to a C string
CFStringGetCString(CFURLGetString(executableURL), buffer,
MAX_OSX_PATH_SIZE, kCFStringEncodingUTF8);
// And finally to a c++ string
executable = bundlePath + "/Contents/MacOS/" + std::string(buffer);
if (CFURLGetFileSystemRepresentation(executableURL, false, buffer,
MAX_OSX_PATH_SIZE)) {
executable = bundlePath + "/Contents/MacOS/" +
std::string(reinterpret_cast<char*>(buffer));
}
// Only release CFURLRef if it's not null
CFRelease(executableURL);
}

1
Tests/RunCMake/find_program/BundleSpaceInName-stdout.txt Normal file
View File

@ -0,0 +1 @@
-- FakeApp_EXECUTABLE='.*/Tests/RunCMake/find_program/BundleSpaceInName-build/Fake app.app/Contents/MacOS/Fake app'

8
Tests/RunCMake/find_program/BundleSpaceInName.cmake Normal file
View File

@ -0,0 +1,8 @@
set(fakeApp "${CMAKE_CURRENT_BINARY_DIR}/Fake app.app/Contents/MacOS/Fake app")
file(WRITE "${fakeApp}" "#!/bin/sh\n")
execute_process(COMMAND chmod a+rx "${fakeApp}")
find_program(FakeApp_EXECUTABLE NAMES "Fake app" NO_DEFAULT_PATH
PATHS "${CMAKE_CURRENT_BINARY_DIR}"
)
message(STATUS "FakeApp_EXECUTABLE='${FakeApp_EXECUTABLE}'")

4
Tests/RunCMake/find_program/RunCMakeTest.cmake
View File

@ -20,3 +20,7 @@ else()
run_cmake(ExeNoRead)
endif()
endif()
if(APPLE)
run_cmake(BundleSpaceInName)
endif()