From b7b2627b3746e28fe64c9af74583c8b24edee909 Mon Sep 17 00:00:00 2001
From: freiro <f73b2894@opayq.com>
Date: Tue, 13 Dec 2016 00:01:48 +0100
Subject: Modularized Qt and SDL file copying Now cmake relies on two
 submodules to copy the libraries in the proper folders

---
 CMakeModules/CopyCitraQt5Deps.cmake | 17 +++++++++++++++++
 CMakeModules/CopyCitraSDLDeps.cmake |  5 +++++
 CMakeModules/CopyMSVCLibsQt.cmake   | 19 -------------------
 3 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 CMakeModules/CopyCitraQt5Deps.cmake
 create mode 100644 CMakeModules/CopyCitraSDLDeps.cmake
 delete mode 100644 CMakeModules/CopyMSVCLibsQt.cmake

(limited to 'CMakeModules')

diff --git a/CMakeModules/CopyCitraQt5Deps.cmake b/CMakeModules/CopyCitraQt5Deps.cmake
new file mode 100644
index 000000000..05f58cf9a
--- /dev/null
+++ b/CMakeModules/CopyCitraQt5Deps.cmake
@@ -0,0 +1,17 @@
+function(copy_citra_Qt5_deps target_dir)
+    include(WindowsCopyFiles)
+    set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
+    set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
+    set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
+    set(PLATFORMS ${DLL_DEST}platforms/)
+    windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
+        icudt*.dll
+        icuin*.dll
+        icuuc*.dll
+        Qt5Core$<$<CONFIG:Debug>:d>.*
+        Qt5Gui$<$<CONFIG:Debug>:d>.*
+        Qt5OpenGL$<$<CONFIG:Debug>:d>.*
+        Qt5Widgets$<$<CONFIG:Debug>:d>.*
+    )
+    windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
+endfunction(copy_citra_Qt5_deps)
diff --git a/CMakeModules/CopyCitraSDLDeps.cmake b/CMakeModules/CopyCitraSDLDeps.cmake
new file mode 100644
index 000000000..4f9e4aeb9
--- /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/CMakeModules/CopyMSVCLibsQt.cmake b/CMakeModules/CopyMSVCLibsQt.cmake
deleted file mode 100644
index 64b27a807..000000000
--- a/CMakeModules/CopyMSVCLibsQt.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-function(copy_msvc_libraries)
-    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}
-        icudt*.dll
-        icuin*.dll
-        icuuc*.dll
-        Qt5Core$<$<CONFIG:Debug>:d>.*
-        Qt5Gui$<$<CONFIG:Debug>:d>.*
-        Qt5OpenGL$<$<CONFIG:Debug>:d>.*
-        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
-- 
cgit v1.2.3