From ebd2a15711472302401879f9fec38370860e7cb6 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Mon, 12 Dec 2016 12:18:51 +0100 Subject: [PATCH] shell/macOS: Remove backslashes from the extension display name Tell cmake not to escape shell strings adding backslashes before spaces by passing the VERBATIM optiton. Also add the quotes to whole command line arguments to prevent quotes from appearing on the XCode side, because of the VERBATIM option. This only affects themed clients since the default theme doesn't have space in its APPLICATION_NAME. --- shell_integration/MacOSX/CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/shell_integration/MacOSX/CMakeLists.txt b/shell_integration/MacOSX/CMakeLists.txt index 7461d6df7..2e594bfce 100644 --- a/shell_integration/MacOSX/CMakeLists.txt +++ b/shell_integration/MacOSX/CMakeLists.txt @@ -16,12 +16,13 @@ set(OC_OEM_SHARE_ICNS "${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns") # those user-defined settings to build the plist. add_custom_target( mac_overlayplugin ALL xcodebuild -project ${CMAKE_SOURCE_DIR}/shell_integration/MacOSX/OwnCloudFinderSync/OwnCloudFinderSync.xcodeproj - -target FinderSyncExt -configuration Release SYMROOT=${CMAKE_CURRENT_BINARY_DIR} - OC_OEM_SHARE_ICNS=${OC_OEM_SHARE_ICNS} - OC_APPLICATION_NAME="${APPLICATION_NAME}" - OC_APPLICATION_REV_DOMAIN=${APPLICATION_REV_DOMAIN} - OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX=${SOCKETAPI_TEAM_IDENTIFIER_PREFIX} - COMMENT building Mac Overlay icons) + -target FinderSyncExt -configuration Release "SYMROOT=${CMAKE_CURRENT_BINARY_DIR}" + "OC_OEM_SHARE_ICNS=${OC_OEM_SHARE_ICNS}" + "OC_APPLICATION_NAME=${APPLICATION_NAME}" + "OC_APPLICATION_REV_DOMAIN=${APPLICATION_REV_DOMAIN}" + "OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX=${SOCKETAPI_TEAM_IDENTIFIER_PREFIX}" + COMMENT building Mac Overlay icons + VERBATIM) add_dependencies(mac_overlayplugin ${APPLICATION_EXECUTABLE}) # for the ownCloud.icns to be generated