CMake: fix dmg_package target since CMake 3.12
authorPeter Wu <peter@lekensteyn.nl>
Mon, 27 Aug 2018 12:16:00 +0000 (14:16 +0200)
committerGerald Combs <gerald@wireshark.org>
Wed, 29 Aug 2018 23:51:10 +0000 (23:51 +0000)
The Resources directory was removed a while back. Since CMake 3.12, the
copy_directory command will fail when the source directory is missing.
Reported by anta_tw in the #wireshark IRC channel at Freenode.

Change-Id: I4de087dd2833e79a806c8a0c9a28024848e1e03f
Fixes: v2.1.0rc0-2347-g4aa049019a ("OS X: Remove GTK+ packaging.")
Reviewed-on: https://code.wireshark.org/review/29304
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
CMakeLists.txt

index aecc22b6b04989cea85faa00007c4e6726117491..db3a7dab618c9dacfd5e61184220f394913951de 100644 (file)
@@ -2656,9 +2656,6 @@ if(ENABLE_APPLICATION_BUNDLE)
                COMMAND ${CMAKE_COMMAND} -E copy_directory
                                        ${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF
                                        ${CMAKE_BINARY_DIR}/run/ChmodBPF
-               COMMAND ${CMAKE_COMMAND} -E copy_directory
-                                       ${CMAKE_SOURCE_DIR}/packaging/macosx/Resources
-                                       ${CMAKE_BINARY_DIR}/run/Resources
                COMMAND ${CMAKE_COMMAND} -E copy_directory
                                        ${CMAKE_SOURCE_DIR}/packaging/macosx/Scripts
                                        ${CMAKE_BINARY_DIR}/run/Scripts