summaryrefslogtreecommitdiff
path: root/CMakeModules
diff options
context:
space:
mode:
authorGravatar freiro2016-12-13 00:01:48 +0100
committerGravatar freiro2016-12-13 21:05:00 +0100
commitb7b2627b3746e28fe64c9af74583c8b24edee909 (patch)
tree8edfeefdfdcdd595ca0d2499e83db64e1c81ebc0 /CMakeModules
parentModularization of copy_msvc_libraries cmake funct (diff)
downloadyuzu-b7b2627b3746e28fe64c9af74583c8b24edee909.tar.gz
yuzu-b7b2627b3746e28fe64c9af74583c8b24edee909.tar.xz
yuzu-b7b2627b3746e28fe64c9af74583c8b24edee909.zip
Modularized Qt and SDL file copying
Now cmake relies on two submodules to copy the libraries in the proper folders
Diffstat (limited to 'CMakeModules')
-rw-r--r--CMakeModules/CopyCitraQt5Deps.cmake (renamed from CMakeModules/CopyMSVCLibsQt.cmake)8
-rw-r--r--CMakeModules/CopyCitraSDLDeps.cmake5
2 files changed, 8 insertions, 5 deletions
diff --git a/CMakeModules/CopyMSVCLibsQt.cmake b/CMakeModules/CopyCitraQt5Deps.cmake
index 64b27a807..05f58cf9a 100644
--- a/CMakeModules/CopyMSVCLibsQt.cmake
+++ b/CMakeModules/CopyCitraQt5Deps.cmake
@@ -1,12 +1,10 @@
1function(copy_msvc_libraries) 1function(copy_citra_Qt5_deps target_dir)
2 include(WindowsCopyFiles) 2 include(WindowsCopyFiles)
3 set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") 3 set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
4 windows_copy_files(citra-qt ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
5
6 set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin") 4 set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
7 set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/") 5 set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
8 set(PLATFORMS ${DLL_DEST}platforms/) 6 set(PLATFORMS ${DLL_DEST}platforms/)
9 windows_copy_files(citra-qt ${Qt5_DLL_DIR} ${DLL_DEST} 7 windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST}
10 icudt*.dll 8 icudt*.dll
11 icuin*.dll 9 icuin*.dll
12 icuuc*.dll 10 icuuc*.dll
@@ -16,4 +14,4 @@ function(copy_msvc_libraries)
16 Qt5Widgets$<$<CONFIG:Debug>:d>.* 14 Qt5Widgets$<$<CONFIG:Debug>:d>.*
17 ) 15 )
18 windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) 16 windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
19endfunction(copy_msvc_libraries) \ No newline at end of file 17endfunction(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 @@
1function(copy_citra_SDL_deps target_dir)
2 include(WindowsCopyFiles)
3 set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
4 windows_copy_files(${target_dir} ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
5endfunction(copy_citra_SDL_deps)