Don't deploy bearer plugin on MacOS
authorFelix Weilbach <felix.weilbach@nextcloud.com>
Fri, 26 Mar 2021 10:28:40 +0000 (11:28 +0100)
committerFelix Weilbach (Rebase PR Action) <felix.weilbach@t-online.de>
Mon, 29 Mar 2021 13:46:07 +0000 (13:46 +0000)
Fixes #2944, #2237

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
src/gui/CMakeLists.txt

index d3e943063f26fbae77f14d9572738835a17b43c8..01d26552df8c7e7b98585c43767671770505cdd9 100644 (file)
@@ -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()