From b7b2627b3746e28fe64c9af74583c8b24edee909 Mon Sep 17 00:00:00 2001
From: freiro <f73b2894@opayq.com>
Date: Tue, 13 Dec 2016 00:01:48 +0100
Subject: [PATCH] Modularized Qt and SDL file copying Now cmake relies on two
submodules to copy the libraries in the proper folders
---
.../{CopyMSVCLibsQt.cmake => CopyCitraQt5Deps.cmake} | 8 +++-----
CMakeModules/CopyCitraSDLDeps.cmake | 5 +++++
src/citra/CMakeLists.txt | 11 ++++-------
src/citra_qt/CMakeLists.txt | 6 ++++--
4 files changed, 16 insertions(+), 14 deletions(-)
rename CMakeModules/{CopyMSVCLibsQt.cmake => CopyCitraQt5Deps.cmake} (74%)
create mode 100644 CMakeModules/CopyCitraSDLDeps.cmake
diff --git a/CMakeModules/CopyMSVCLibsQt.cmake b/CMakeModules/CopyCitraQt5Deps.cmake
similarity index 74%
rename from CMakeModules/CopyMSVCLibsQt.cmake
rename to CMakeModules/CopyCitraQt5Deps.cmake
index 64b27a8071..05f58cf9a4 100644
--- a/CMakeModules/CopyMSVCLibsQt.cmake
+++ b/CMakeModules/CopyCitraQt5Deps.cmake
@@ -1,12 +1,10 @@
-function(copy_msvc_libraries)
+function(copy_citra_Qt5_deps target_dir)
include(WindowsCopyFiles)
set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
- windows_copy_files(citra-qt ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
-
set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
set(PLATFORMS ${DLL_DEST}platforms/)
- windows_copy_files(citra-qt ${Qt5_DLL_DIR} ${DLL_DEST}
+ windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
icudt*.dll
icuin*.dll
icuuc*.dll
@@ -16,4 +14,4 @@ function(copy_msvc_libraries)
Qt5Widgets$<$<CONFIG:Debug>:d>.*
)
windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
-endfunction(copy_msvc_libraries)
\ No newline at end of file
+endfunction(copy_citra_Qt5_deps)
diff --git a/CMakeModules/CopyCitraSDLDeps.cmake b/CMakeModules/CopyCitraSDLDeps.cmake
new file mode 100644
index 0000000000..4f9e4aeb90
--- /dev/null
+++ b/CMakeModules/CopyCitraSDLDeps.cmake
@@ -0,0 +1,5 @@
+function(copy_citra_SDL_deps target_dir)
+ include(WindowsCopyFiles)
+ set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
+ windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
+endfunction(copy_citra_SDL_deps)
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index f9c488a1a0..ecb5d2dfe7 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
+
set(SRCS
emu_window/emu_window_sdl2.cpp
citra.cpp
@@ -28,11 +30,6 @@ if(UNIX AND NOT APPLE)
endif()
if (MSVC)
- include(WindowsCopyFiles)
-
- set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
-
- windows_copy_files(citra ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
-
- unset(DLL_DEST)
+ include(CopyCitraSDLDeps)
+ copy_citra_SDL_deps(citra)
endif()
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 64c4330c18..e1b3566bff 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -108,7 +108,9 @@ if(UNIX AND NOT APPLE)
install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
endif()
-include(CopyMSVCLibsQt)
if (MSVC)
- copy_msvc_libraries()
+ include(CopyCitraQt5Deps)
+ include(CopyCitraSDLDeps)
+ copy_citra_Qt5_deps(citra-qt)
+ copy_citra_SDL_deps(citra-qt)
endif()