From e20560a2dc9668bb9fd55bea79ef7508ab72c746 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 11 Jan 2021 14:43:36 -0500 Subject: cmake-gui: Restore linking of Qt resources Refactoring in commit 41e223deb3 (CMake GUI: Split up into libraries, add test shim, 2020-09-14, v3.19.0-rc1~116^2~2) broke linking of Qt resources, such as the Add/Remove Entry button icons. Fixes: #21682 --- Source/QtDialog/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index f7d9b77..0f0c39a 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -132,6 +132,7 @@ qt5_wrap_cpp(MOC_SRCS WarningMessagesDialog.h ) qt5_add_resources(RC_SRCS CMakeSetup.qrc) +add_library(CMakeGUIQRCLib OBJECT ${RC_SRCS}) if (FALSE) # CMake's bootstrap binary does not support automoc set(CMAKE_AUTOMOC 1) @@ -140,8 +141,7 @@ if (FALSE) # CMake's bootstrap binary does not support automoc else () list(APPEND SRCS ${UI_SRCS} - ${MOC_SRCS} - ${RC_SRCS}) + ${MOC_SRCS}) endif () if(USE_LGPL) @@ -164,6 +164,7 @@ target_link_libraries(CMakeGUIMainLib PUBLIC CMakeGUILib) add_executable(cmake-gui WIN32 MACOSX_BUNDLE CMakeGUIExec.cxx ${MANIFEST_FILE}) target_link_libraries(cmake-gui CMakeGUIMainLib Qt5::Core) +target_sources(CMakeGUIMainLib INTERFACE $) if(WIN32) target_sources(CMakeGUIMainLib INTERFACE $ CMakeSetup.rc) endif() -- cgit v0.12