diff options
| author | LostDragonist <lost.dragonist@gmail.com> | 2019-05-02 05:49:00 -0500 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2019-05-02 05:57:34 -0500 |
| commit | 5f0dc90ceb52cae04d286939126ffa75aad9d45c (patch) | |
| tree | f34880f40737606854afd7c8794569066a6a41c3 /src | |
| parent | 65c137bf5928d15c94d9ade532bce49823426985 (diff) | |
Fix installing qdds.dll
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6f3ed96b..8b368257 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -362,11 +362,8 @@ INSTALL(FILES $<TARGET_PDB_FILE:ModOrganizer> INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5 DESTINATION bin/dlls RENAME dlls.manifest) - -# qdds.dll needs installing manually as Qt no longer ships with it by default. -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll DESTINATION bin/dlls/imageformats) -install(FILES ${organizer_translations_qm} DESTINATION bin/translations) +INSTALL(FILES ${organizer_translations_qm} DESTINATION bin/translations) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stylesheets ${CMAKE_CURRENT_SOURCE_DIR}/tutorials @@ -381,7 +378,6 @@ INSTALL( ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets --websockets ${windeploy_parameters} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin ) - EXECUTE_PROCESS(COMMAND ${qt5bin}/windeployqt.exe uibase.dll ${windeploy_parameters} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin @@ -395,3 +391,5 @@ INSTALL( file(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/bin/qtplugins)" ) +# qdds.dll needs installing manually as Qt no longer ships with it by default. +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll DESTINATION bin/dlls/imageformats)
\ No newline at end of file |