From 1fd1620e4e5377ebec34ed7de4ee92e0b0330e1c Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sun, 5 Feb 2017 22:21:39 -0800 Subject: [PATCH] CMake: add CMAKE_CONFIGURE_DEPENDS on Data/Sys Since files from Data/Sys are collected and added to a built macOS .app bundle using GLOB, any new files won't get picked up until the next time CMake is run. Tell CMake it should re-run itself every time the directory is touched. --- Source/Core/DolphinQt2/CMakeLists.txt | 1 + Source/Core/DolphinWX/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/Source/Core/DolphinQt2/CMakeLists.txt b/Source/Core/DolphinQt2/CMakeLists.txt index 877d1ff02d..a3ec2d13a9 100644 --- a/Source/Core/DolphinQt2/CMakeLists.txt +++ b/Source/Core/DolphinQt2/CMakeLists.txt @@ -59,6 +59,7 @@ if(APPLE) set_source_files_properties("${qtcocoa_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/platforms) # Copy resources into the bundle + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/Data/Sys") file(GLOB_RECURSE resources RELATIVE "${CMAKE_SOURCE_DIR}/Data" "${CMAKE_SOURCE_DIR}/Data/Sys/*") foreach(res ${resources}) target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}") diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 020b7bbd59..f065e139e3 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -166,6 +166,7 @@ if(wxWidgets_FOUND) ) # Copy resources in the bundle + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/Data/Sys") file(GLOB_RECURSE resources RELATIVE "${CMAKE_SOURCE_DIR}/Data" "${CMAKE_SOURCE_DIR}/Data/Sys/*") foreach(res ${resources}) target_sources(${DOLPHIN_EXE} PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}")