Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Weilbach <felix.weilbach@nextcloud.com>2021-03-26 13:28:40 +0300
committerFelix Weilbach (Rebase PR Action) <felix.weilbach@t-online.de>2021-03-29 16:46:07 +0300
commit354f4c02ee7072eda55bb182802e23262c4a6ede (patch)
tree82e758c15bf57d20250d43e07e183fc6001266f3 /src/gui/CMakeLists.txt
parent58dd076b2bd347edf7985d43fca532da8f4c852e (diff)
Don't deploy bearer plugin on MacOS
Fixes #2944, #2237 Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
Diffstat (limited to 'src/gui/CMakeLists.txt')
-rw-r--r--src/gui/CMakeLists.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index d3e943063..01d26552d 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -430,11 +430,13 @@ if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
add_custom_command(TARGET ${APPLICATION_EXECUTABLE} POST_BUILD
COMMAND "${MACDEPLOYQT_EXECUTABLE}"
- "$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/../.."
- -qmldir=${CMAKE_SOURCE_DIR}/src/gui
- -always-overwrite
- -executable="$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/${cmd_NAME}"
- ${NO_STRIP}
+ "$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/../.."
+ -qmldir=${CMAKE_SOURCE_DIR}/src/gui
+ -always-overwrite
+ -executable="$<TARGET_FILE_DIR:${APPLICATION_EXECUTABLE}>/${cmd_NAME}"
+ ${NO_STRIP}
+ COMMAND "${CMAKE_COMMAND}"
+ -E rm -rf "${BIN_OUTPUT_DIRECTORY}/${OWNCLOUD_OSX_BUNDLE}/Contents/PlugIns/bearer"
COMMENT "Running macdeployqt..."
)
endif()