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:29 (GMT) |
| commit | 97a713cf257a83347d6950d9411cda80a95e4696 (patch) | |
| tree | 79713d0dd074d7ac251c65a1648d9a43b377a016 | |
| parent | 6b50b8d947931e63b7173a487d6655ff7743a61b (diff) | |
| parent | 9f48a468cd68d69e16302174ff202e9e51035023 (diff) | |
| download | CMake-97a713cf257a83347d6950d9411cda80a95e4696.zip CMake-97a713cf257a83347d6950d9411cda80a95e4696.tar.gz CMake-97a713cf257a83347d6950d9411cda80a95e4696.tar.bz2 | |
Merge topic 'cmake-gui-qrc-fix'
9f48a468cd Merge branch 'master' into cmake-gui-qrc-fix
e20560a2dc cmake-gui: Restore linking of Qt resources
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5691
| -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 d8f89d6..0c263bb 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -213,6 +213,7 @@ else() qt_wrap_cpp(MOC_BUILT_SRCS ${MOC_SRCS}) qt_add_resources(QRC_BUILT_SRCS ${QRC_SRCS}) endif() +add_library(CMakeGUIQRCLib OBJECT ${QRC_BUILT_SRCS}) if (FALSE) # CMake's bootstrap binary does not support automoc set(CMAKE_AUTOMOC 1) @@ -221,8 +222,7 @@ if (FALSE) # CMake's bootstrap binary does not support automoc else () list(APPEND SRCS ${UI_BUILT_SRCS} - ${MOC_BUILT_SRCS} - ${QRC_BUILT_SRCS}) + ${MOC_BUILT_SRCS}) endif () if(USE_LGPL) @@ -246,6 +246,7 @@ target_link_libraries(CMakeGUIMainLib PUBLIC CMakeGUILib) add_executable(cmake-gui WIN32 MACOSX_BUNDLE CMakeGUIExec.cxx ${MANIFEST_FILE}) target_link_libraries(cmake-gui CMakeGUIMainLib Qt${INSTALLED_QT_VERSION}::Core) +target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeGUIQRCLib>) if(WIN32) target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeVersion> CMakeSetup.rc) endif() |