diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-13 16:39:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-13 16:39:49 (GMT) |
| commit | 7e52b82611d2a262bed69b76b7755e7b6a490b4a (patch) | |
| tree | 9ca42c878b25e28f0a3d96f15051d4c1cc4f2866 | |
| parent | f04bad909111201f20fd893a09976a0d13af6afa (diff) | |
| parent | f7ae4f572bb3048ea98c58b001aaafa6a7c85f00 (diff) | |
| download | CMake-7e52b82611d2a262bed69b76b7755e7b6a490b4a.zip CMake-7e52b82611d2a262bed69b76b7755e7b6a490b4a.tar.gz CMake-7e52b82611d2a262bed69b76b7755e7b6a490b4a.tar.bz2 | |
Merge topic 'cmake-gui-windows-icon' into release-3.19
f7ae4f572b cmake-gui: Restore application icon on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5362
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index d6ae03b..bff3cb8 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -141,10 +141,6 @@ else () ${RC_SRCS}) endif () -if(WIN32) - list(APPEND SRCS CMakeSetup.rc) -endif() - if(USE_LGPL) install(FILES ${CMake_SOURCE_DIR}/Licenses/LGPLv${USE_LGPL}.txt DESTINATION ${CMAKE_DATA_DIR}/Licenses @@ -166,7 +162,7 @@ add_executable(cmake-gui WIN32 MACOSX_BUNDLE CMakeGUIExec.cxx ${MANIFEST_FILE}) target_link_libraries(cmake-gui CMakeGUIMainLib Qt5::Core) if(WIN32) - target_sources(CMakeGUILib INTERFACE $<TARGET_OBJECTS:CMakeVersion>) + target_sources(CMakeGUILib INTERFACE $<TARGET_OBJECTS:CMakeVersion> CMakeSetup.rc) endif() if(APPLE) target_sources(CMakeGUILib INTERFACE CMakeSetup.icns) |