Removed redundant Qt check and other fixes
This removes a redundant check and moves part of the code to a separate function.
This commit is contained in:
parent
143bc8713d
commit
942f70951d
1 changed files with 19 additions and 20 deletions
|
@ -107,11 +107,11 @@ 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/)
|
||||
|
@ -125,9 +125,8 @@ if (MSVC)
|
|||
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)
|
||||
endfunction(copy_msvc_libraries)
|
||||
|
||||
if (MSVC)
|
||||
copy_msvc_libraries()
|
||||
endif()
|
||||
|
|
Loading…
Reference in a new issue