summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar freiro2016-12-11 15:36:34 +0100
committerGravatar freiro2016-12-11 15:36:34 +0100
commit031fc3a46011ea64362549a993e52f0018bfe5b8 (patch)
tree0bad63dff2866bb3bb7d9e645dad3bcb0a338929 /src
parentRemoved redundant Qt check and other fixes (diff)
downloadyuzu-031fc3a46011ea64362549a993e52f0018bfe5b8.tar.gz
yuzu-031fc3a46011ea64362549a993e52f0018bfe5b8.tar.xz
yuzu-031fc3a46011ea64362549a993e52f0018bfe5b8.zip
Modularization of copy_msvc_libraries cmake funct
Created a new folder in Citra's root called CMakeModules that should contain cmake functions used by the various CMakeLists.txt.
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/CMakeLists.txt22
1 files changed, 2 insertions, 20 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index f283545aa..64c4330c1 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -1,5 +1,6 @@
1set(CMAKE_AUTOMOC ON) 1set(CMAKE_AUTOMOC ON)
2set(CMAKE_INCLUDE_CURRENT_DIR ON) 2set(CMAKE_INCLUDE_CURRENT_DIR ON)
3set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
3 4
4set(SRCS 5set(SRCS
5 config.cpp 6 config.cpp
@@ -107,26 +108,7 @@ if(UNIX AND NOT APPLE)
107 install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") 108 install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
108endif() 109endif()
109 110
110function(copy_msvc_libraries) 111include(CopyMSVCLibsQt)
111 include(WindowsCopyFiles)
112 set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
113 windows_copy_files(citra-qt ${SDL2_DLL_DIR} ${DLL_DEST} SDL2.dll)
114
115 set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
116 set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
117 set(PLATFORMS ${DLL_DEST}platforms/)
118 windows_copy_files(citra-qt ${Qt5_DLL_DIR} ${DLL_DEST}
119 icudt*.dll
120 icuin*.dll
121 icuuc*.dll
122 Qt5Core$<$<CONFIG:Debug>:d>.*
123 Qt5Gui$<$<CONFIG:Debug>:d>.*
124 Qt5OpenGL$<$<CONFIG:Debug>:d>.*
125 Qt5Widgets$<$<CONFIG:Debug>:d>.*
126 )
127 windows_copy_files(citra-qt ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
128endfunction(copy_msvc_libraries)
129
130if (MSVC) 112if (MSVC)
131 copy_msvc_libraries() 113 copy_msvc_libraries()
132endif() 114endif()