Revert "Moving things around"

This commit is contained in:
isanae
2020-11-27 07:30:07 -05:00
committed by GitHub
parent 39aae6fb01
commit 256bb980b7
2 changed files with 10 additions and 13 deletions
-2
View File
@@ -1,2 +0,0 @@
/.vs
/*build
+10 -11
View File
@@ -27,7 +27,6 @@ function(deploy_qt)
endif()
set(bin "${CMAKE_INSTALL_PREFIX}/bin")
set(dlls "${bin}/dlls")
set(deploys "")
foreach(binary ${deploy_qt_BINARIES})
@@ -37,20 +36,20 @@ function(deploy_qt)
WORKING_DIRECTORY ${bin})")
endforeach()
install(CODE "${deploys}")
install(CODE "
${deploys}
file(REMOVE_RECURSE ${bin}/platforms)
file(REMOVE_RECURSE ${bin}/styles)
file(REMOVE_RECURSE ${bin}/dlls/imageformats)
")
if(NOT ${deploy_qt_NOPLUGINS})
install(CODE "
file(COPY ${bin}/qtplugins/imageformats DESTINATION ${dlls})
file(COPY ${bin}/qtplugins/platforms DESTINATION ${dlls})
file(COPY ${bin}/qtplugins/styles DESTINATION ${dlls})
file(COPY ${bin}/QtQuick.2 DESTINATION ${dlls})
file(COPY ${bin}/QtWebEngineProcess.exe DESTINATION ${bin}/resources)
file(COPY ${bin}/translations DESTINATION ${bin}/resources)
file(RENAME ${bin}/qtplugins/platforms ${bin}/platforms)
file(RENAME ${bin}/qtplugins/styles ${bin}/styles)
file(RENAME ${bin}/qtplugins/imageformats ${bin}/dlls/imageformats)
file(REMOVE_RECURSE ${bin}/qtplugins)
file(REMOVE_RECURSE ${bin}/QtQuick.2)
file(REMOVE_RECURSE ${bin}/QtWebEngineProcess.exe)
file(REMOVE_RECURSE ${bin}/translations)
")
endif()
endfunction()