diff options
| author | Jeremy Rimpo <jeremy.rimpo@servermonkey.com> | 2018-03-10 17:50:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-10 17:50:24 -0600 |
| commit | 090d660831d0240391294500225429bc45c77399 (patch) | |
| tree | 261bf9d20321a69f6703a15a62fb0b1913e7a293 /src | |
| parent | 00d8c517ec6fa15b042b84c69824175d80605334 (diff) | |
| parent | b7b12bb789d1a60ae0a7fc7fe923949c577cd8aa (diff) | |
Merge pull request #268 from AnyOldName3/qt-deploy-fix
Improve Qt deployment so all DLLs are staged properly
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ed6c836a..c94aa689 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -347,13 +347,16 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5 SET(windeploy_parameters "--no-translations --plugindir qtplugins --libdir dlls --release-with-debug-info --no-compiler-runtime") INSTALL( CODE - "EXECUTE_PROCESS( - COMMAND + "EXECUTE_PROCESS(COMMAND ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets ${windeploy_parameters} - # run it a second time because on the first run it misses some files - COMMAND + WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin + ) + # run it a second time because on the first run it misses some files + EXECUTE_PROCESS(COMMAND ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets ${windeploy_parameters} - COMMAND + WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin + ) + EXECUTE_PROCESS(COMMAND ${qt5bin}/windeployqt.exe uibase.dll ${windeploy_parameters} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin ) |