From b55c20a1b1b798fdfbc48cb622ae9ca772ecb4f1 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 27 Aug 2018 14:16:00 +0200 Subject: [PATCH] CMake: fix dmg_package target since CMake 3.12 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 Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aecc22b6b0..db3a7dab61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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