diff options
| author | freiro <f73b2894@opayq.com> | 2016-12-11 15:36:34 +0100 |
|---|---|---|
| committer | freiro <f73b2894@opayq.com> | 2016-12-11 15:36:34 +0100 |
| commit | 031fc3a46011ea64362549a993e52f0018bfe5b8 (patch) | |
| tree | 0bad63dff2866bb3bb7d9e645dad3bcb0a338929 | |
| parent | Removed redundant Qt check and other fixes (diff) | |
| download | yuzu-031fc3a46011ea64362549a993e52f0018bfe5b8.tar yuzu-031fc3a46011ea64362549a993e52f0018bfe5b8.tar.gz yuzu-031fc3a46011ea64362549a993e52f0018bfe5b8.tar.bz2 yuzu-031fc3a46011ea64362549a993e52f0018bfe5b8.tar.lz yuzu-031fc3a46011ea64362549a993e52f0018bfe5b8.tar.xz yuzu-031fc3a46011ea64362549a993e52f0018bfe5b8.tar.zst yuzu-031fc3a46011ea64362549a993e52f0018bfe5b8.zip | |
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | CMakeModules/CopyMSVCLibsQt.cmake | 19 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 22 |
3 files changed, 22 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c02c96840..c7255a998 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ # CMake 3.2 required for cmake to know the right flags for CXX standard on OSX cmake_minimum_required(VERSION 3.2) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) function(download_bundled_external remote_path lib_name prefix_var) set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}") diff --git a/CMakeModules/CopyMSVCLibsQt.cmake b/CMakeModules/CopyMSVCLibsQt.cmake new file mode 100644 index 000000000..64b27a807 --- /dev/null +++ b/CMakeModules/CopyMSVCLibsQt.cmake @@ -0,0 +1,19 @@ +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 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 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) set(SRCS config.cpp @@ -107,26 +108,7 @@ if(UNIX AND NOT APPLE) install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") endif() -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) - +include(CopyMSVCLibsQt) if (MSVC) copy_msvc_libraries() endif() |