summaryrefslogtreecommitdiffstats
path: root/src/citra_qt/CMakeLists.txt
diff options
context:
space:
mode:
authorJames Rowe <jroweboy@gmail.com>2015-03-26 11:00:49 +0100
committerJames Rowe <jroweboy@gmail.com>2015-03-26 11:04:24 +0100
commit5b9a5493c5151fe326b495c944687fc690598ef5 (patch)
tree147a67ec72c914a4e6bb5a9d6f004cbcf55f64d7 /src/citra_qt/CMakeLists.txt
parentChanges to bring the previous commits in line with the comments on thepull request. Made the debug build a true debug build with no optimizxations and the RelWithDebInfo is what it says it is too. Changed the copying of the dlls to the build directories to happen at configuration time instead of build time (diff)
downloadyuzu-5b9a5493c5151fe326b495c944687fc690598ef5.tar
yuzu-5b9a5493c5151fe326b495c944687fc690598ef5.tar.gz
yuzu-5b9a5493c5151fe326b495c944687fc690598ef5.tar.bz2
yuzu-5b9a5493c5151fe326b495c944687fc690598ef5.tar.lz
yuzu-5b9a5493c5151fe326b495c944687fc690598ef5.tar.xz
yuzu-5b9a5493c5151fe326b495c944687fc690598ef5.tar.zst
yuzu-5b9a5493c5151fe326b495c944687fc690598ef5.zip
Diffstat (limited to 'src/citra_qt/CMakeLists.txt')
-rw-r--r--src/citra_qt/CMakeLists.txt53
1 files changed, 26 insertions, 27 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 23513d7e2..2545b5d6a 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -77,34 +77,33 @@ target_link_libraries(citra-qt ${PLATFORM_LIBRARIES})
if (Qt5_FOUND AND MSVC)
set(Qt5_DLL_DIR "${Qt5_DIR}/../../../bin")
- file(GLOB Qt5_DEBUG_DLLS
- "${Qt5_DLL_DIR}/icudt*.dll"
- "${Qt5_DLL_DIR}/icuin*.dll"
- "${Qt5_DLL_DIR}/icuuc*.dll"
- "${Qt5_DLL_DIR}/Qt5Cored.*"
- "${Qt5_DLL_DIR}/Qt5Guid.*"
- "${Qt5_DLL_DIR}/Qt5OpenGLd.*"
- "${Qt5_DLL_DIR}/Qt5Widgetsd.*"
+ set(Qt5_PLATFORMS_DIR "${Qt5_DIR}/../../../plugins/platforms/")
+ set(Qt5_DLLS
+ icudt*.dll
+ icuin*.dll
+ icuuc*.dll
+ Qt5Core$<$<CONFIG:Debug>:d>.*
+ Qt5Gui$<$<CONFIG:Debug>:d>.*
+ Qt5OpenGL$<$<CONFIG:Debug>:d>.*
+ Qt5Widgets$<$<CONFIG:Debug>:d>.*
)
- file(GLOB Qt5_RELEASE_DLLS
- "${Qt5_DLL_DIR}/icudt*.dll"
- "${Qt5_DLL_DIR}/icuin*.dll"
- "${Qt5_DLL_DIR}/icuuc*.dll"
- "${Qt5_DLL_DIR}/Qt5Core.*"
- "${Qt5_DLL_DIR}/Qt5Gui.*"
- "${Qt5_DLL_DIR}/Qt5OpenGL.*"
- "${Qt5_DLL_DIR}/Qt5Widgets.*"
+ set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
+ set(PLATFORMS ${DLL_DEST}platforms/)
+
+ # windows commandline expects the / to be \ so switch them
+ string(REPLACE "/" "\\" Qt5_DLL_DIR ${Qt5_DLL_DIR})
+ string(REPLACE "/" "\\" Qt5_PLATFORMS_DIR ${Qt5_PLATFORMS_DIR})
+ string(REPLACE "/" "\\" DLL_DEST ${DLL_DEST})
+ string(REPLACE "/" "\\" PLATFORMS ${PLATFORMS})
+
+ # /NJH /NJS /NDL /NFL /NC /NS /NP - Silence any output
+ # cmake adds an extra check for command success which doesn't work too well with robocopy
+ # so trick it into thinking the command was successful with the || cmd /c "exit /b 0"
+ add_custom_command(TARGET citra-qt POST_BUILD
+ COMMAND robocopy ${Qt5_DLL_DIR} ${DLL_DEST} ${Qt5_DLLS} /NJH /NJS /NDL /NFL /NC /NS /NP || cmd /c "exit /b 0"
+ COMMAND if not exist ${PLATFORMS} mkdir ${PLATFORMS} 2> nul
+ COMMAND robocopy ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.* /NJH /NJS /NDL /NFL /NC /NS /NP || cmd /c "exit /b 0"
)
- # make the output directories ahead of the time and copy in the needed Dlls now
- file(MAKE_DIRECTORY
- ${CMAKE_BINARY_DIR}/bin/Debug/
- ${CMAKE_BINARY_DIR}/bin/Release/
- ${CMAKE_BINARY_DIR}/bin/RelWithDebInfo/
- )
- file(COPY ${Qt5_DEBUG_DLLS} DESTINATION ${CMAKE_BINARY_DIR}/bin/Debug/)
- file(COPY ${Qt5_RELEASE_DLLS} DESTINATION ${CMAKE_BINARY_DIR}/bin/Release/)
- file(COPY ${Qt5_RELEASE_DLLS} DESTINATION ${CMAKE_BINARY_DIR}/bin/RelWithDebInfo/)
- unset(Qt5_RELEASE_DLLS)
- unset(Qt5_DEBUG_DLLS)
+ unset(Qt5_DLLS)
unset(Qt5_DLL_DIR)
endif()