From 688b1e537ead4752dfcff83b13912b38cd478c91 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 19 Nov 2014 14:51:25 -0500 Subject: [PATCH] rename CopyDataIntoBundle target name to avoid wx/qt conflict --- Source/Core/DolphinQt/CMakeLists.txt | 2 +- Source/Core/DolphinWX/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 48fd1cfa06..15e1d65aeb 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -83,7 +83,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") COMMAND ln -nfs ${CMAKE_SOURCE_DIR}/Data/Sys ${BUNDLE_PATH}/Contents/Resources/Sys VERBATIM ) - add_custom_target(CopyDataIntoBundle ALL + add_custom_target(CopyDataIntoBundleQt ALL DEPENDS ${BUNDLE_PATH}/Contents/Resources/Sys ) endif() diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 945cb49164..dda499e8ea 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -181,7 +181,7 @@ elseif(wxWidgets_FOUND) COMMAND ln -nfs ${CMAKE_SOURCE_DIR}/Data/Sys ${BUNDLE_PATH}/Contents/Resources/Sys VERBATIM ) - add_custom_target(CopyDataIntoBundle ALL + add_custom_target(CopyDataIntoBundleWx ALL DEPENDS ${BUNDLE_PATH}/Contents/Resources/Sys ) endif() @@ -219,7 +219,7 @@ elseif(wxWidgets_FOUND) ${CMAKE_SOURCE_DIR}/Data/Sys VERBATIM ) - add_custom_target(CopyTranslationsIntoBundle ALL + add_custom_target(CopyTranslationsIntoBundleWx ALL DEPENDS ${BUNDLE_PATH}/Contents/Resources/en.lproj ) endif()