diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-12 15:19:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-12 15:19:28 (GMT) |
| commit | c3c63801f85b442fcd6ac6d1208d6375714f1fc1 (patch) | |
| tree | 01165cbe10c5e567e702dffa2a7f8e024984f375 /Source | |
| parent | fb797841362e3eeec4ce18bf53473dd6ebb33363 (diff) | |
| parent | e20560a2dc9668bb9fd55bea79ef7508ab72c746 (diff) | |
| download | CMake-c3c63801f85b442fcd6ac6d1208d6375714f1fc1.zip CMake-c3c63801f85b442fcd6ac6d1208d6375714f1fc1.tar.gz CMake-c3c63801f85b442fcd6ac6d1208d6375714f1fc1.tar.bz2 | |
Merge topic 'cmake-gui-qrc-fix' into release-3.19
e20560a2dc cmake-gui: Restore linking of Qt resources
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5691
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 5 |
1 files 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 $<TARGET_OBJECTS:CMakeGUIQRCLib>) if(WIN32) target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeVersion> CMakeSetup.rc) endif() |