From f7ae4f572bb3048ea98c58b001aaafa6a7c85f00 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 13 Oct 2020 10:35:14 -0400 Subject: 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. --- Source/QtDialog/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 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_sources(CMakeGUILib INTERFACE $ CMakeSetup.rc) endif() if(APPLE) target_sources(CMakeGUILib INTERFACE CMakeSetup.icns) -- cgit v0.12