From e53842229b97dc2feaacfc9cd804d6f70379bd15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elouan=20App=C3=A9r=C3=A9?= Date: Wed, 2 Sep 2015 18:48:54 +0200 Subject: [PATCH] BUGFIX: qwindows.dll now automatically added to the install folder --- LibPkmGC/CMakeLists.txt | 2 +- PkmGCSaveEditor/CMakeLists.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/LibPkmGC/CMakeLists.txt b/LibPkmGC/CMakeLists.txt index 8157102..8c2f8df 100644 --- a/LibPkmGC/CMakeLists.txt +++ b/LibPkmGC/CMakeLists.txt @@ -43,7 +43,7 @@ else() endif() install(DIRECTORY "include/LibPkmGC" DESTINATION "Release/include" CONFIGURATIONS Release RelWithDebInfo MinSizeRel COMPONENT Headers) -install(DIRECTORY "include/LibPkmGC" DESTINATION "Debug/include" CONFIGURATIONS Release RelWithDebInfo MinSizeRel COMPONENT Headers) +install(DIRECTORY "include/LibPkmGC" DESTINATION "Debug/include" CONFIGURATIONS Debug COMPONENT Headers) install(FILES "README.md" "LICENSE" DESTINATION "Debug/include" CONFIGURATIONS Debug COMPONENT Headers) install(FILES "README.md" "LICENSE" DESTINATION "Release/include" CONFIGURATIONS Release RelWithDebInfo MinSizeRel COMPONENT Headers) diff --git a/PkmGCSaveEditor/CMakeLists.txt b/PkmGCSaveEditor/CMakeLists.txt index 2a0d678..fc910de 100644 --- a/PkmGCSaveEditor/CMakeLists.txt +++ b/PkmGCSaveEditor/CMakeLists.txt @@ -65,6 +65,10 @@ endif() if(COPY_QT_LIBS) get_target_property(qt_libs Qt5::Widgets INTERFACE_LINK_LIBRARIES) get_target_property(qt_widgets_location Qt5::Widgets LOCATION_Release) + if(WIN32) + get_target_property(qt_windows_plugin_location Qt5::QWindowsIntegrationPlugin LOCATION_Release) + list(APPEND QT5_RUNTIME_RELEASE ${qt_windows_plugin_location}) + endif() list(APPEND QT5_RUNTIME_RELEASE ${qt_widgets_location}) foreach(qt_lib ${qt_libs}) get_target_property(qt_lib_location ${qt_lib} LOCATION_Release) @@ -75,6 +79,10 @@ if(COPY_QT_LIBS) get_target_property(qt_libs Qt5::Widgets INTERFACE_LINK_LIBRARIES) get_target_property(qt_widgets_location Qt5::Widgets LOCATION_Debug) + if(WIN32) + get_target_property(qt_windows_plugin_location Qt5::QWindowsIntegrationPlugin LOCATION_Debug) + list(APPEND QT5_RUNTIME_RELEASE ${qt_windows_plugin_location}) + endif() list(APPEND QT5_RUNTIME_DEBUG ${qt_widgets_location}) foreach(qt_lib ${qt_libs}) get_target_property(qt_lib_location ${qt_lib} LOCATION_Debug)