diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-13 14:35:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-10-13 16:09:28 (GMT) |
| commit | f7ae4f572bb3048ea98c58b001aaafa6a7c85f00 (patch) | |
| tree | 9ca42c878b25e28f0a3d96f15051d4c1cc4f2866 | |
| parent | f04bad909111201f20fd893a09976a0d13af6afa (diff) | |
| download | CMake-f7ae4f572bb3048ea98c58b001aaafa6a7c85f00.zip CMake-f7ae4f572bb3048ea98c58b001aaafa6a7c85f00.tar.gz CMake-f7ae4f572bb3048ea98c58b001aaafa6a7c85f00.tar.bz2 | |
cmake-gui: Restore application icon on Windows
In commit 41e223deb3 (CMake GUI: Split up into libraries, add test shim,
2020-09-14) the Windows resource source file that references the icon
was moved to CMakeGUILib, but it needs to be directly in the main
application in order to be attached properly.
| -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) |