summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfreiro <f73b2894@opayq.com>2016-12-11 15:10:21 +0100
committerfreiro <f73b2894@opayq.com>2016-12-11 15:10:21 +0100
commit942f70951d4d52417ff7c8eb6e7638a59ebc0461 (patch)
tree99f9a4574cc56f1817781d3df5b0624053d663f5
parent[MSVC] Copy SDL2.dll to build folder (diff)
downloadyuzu-942f70951d4d52417ff7c8eb6e7638a59ebc0461.tar
yuzu-942f70951d4d52417ff7c8eb6e7638a59ebc0461.tar.gz
yuzu-942f70951d4d52417ff7c8eb6e7638a59ebc0461.tar.bz2
yuzu-942f70951d4d52417ff7c8eb6e7638a59ebc0461.tar.lz
yuzu-942f70951d4d52417ff7c8eb6e7638a59ebc0461.tar.xz
yuzu-942f70951d4d52417ff7c8eb6e7638a59ebc0461.tar.zst
yuzu-942f70951d4d52417ff7c8eb6e7638a59ebc0461.zip
-rw-r--r--src/citra_qt/CMakeLists.txt39
1 files changed, 19 insertions, 20 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 495a9d780..f283545aa 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -107,27 +107,26 @@ if(UNIX AND NOT APPLE)
install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
endif()
-if (MSVC)
+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)
- if (Qt5_FOUND)
- 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>.*)
- unset(Qt5_DLL_DIR)
- unset(Qt5_PLATFORMS_DIR)
- unset(PLATFORMS)
- endif()
- unset(DLL_DEST)
+
+ 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)
+
+if (MSVC)
+ copy_msvc_libraries()
endif()