diff options
| author | Jeremy Rimpo <jeremy.rimpo@servermonkey.com> | 2018-03-10 18:35:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-10 18:35:05 -0600 |
| commit | 12161d68fb1b63fc2f3ac1a33c405f0f36203cde (patch) | |
| tree | fc9a29c673ff6b3c8e7a2a9893a9dc9ab5c729d8 /src | |
| parent | 30a9f61d6df88716a1c6585859ae130e7af427e3 (diff) | |
| parent | 090d660831d0240391294500225429bc45c77399 (diff) | |
Merge pull request #270 from Modorganizer2/master
Pull master changes into develop
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 ) |