Windows: Fix icon not present on executable

* Fixes #11025
This commit is contained in:
Jonathan White 2024-07-04 10:14:09 -04:00
parent d643d338d2
commit 3c5f49dc5b

View File

@ -258,8 +258,7 @@ endif()
if(WIN32) if(WIN32)
list(APPEND gui_SOURCES list(APPEND gui_SOURCES
gui/osutils/winutils/ScreenLockListenerWin.cpp gui/osutils/winutils/ScreenLockListenerWin.cpp
gui/osutils/winutils/WinUtils.cpp gui/osutils/winutils/WinUtils.cpp)
../share/windows/icon.rc)
if (MSVC) if (MSVC)
list(APPEND gui_SOURCES quickunlock/WindowsHello.cpp) list(APPEND gui_SOURCES quickunlock/WindowsHello.cpp)
endif() endif()
@ -413,16 +412,17 @@ endif()
if(WIN32) if(WIN32)
include(GenerateProductVersion) include(GenerateProductVersion)
generate_product_version( generate_product_version(
WIN32_ProductVersionFiles WIN32_ResourceFiles
NAME "KeePassXC" NAME "KeePassXC"
COMPANY_NAME "KeePassXC Team" COMPANY_NAME "KeePassXC Team"
VERSION_MAJOR ${KEEPASSXC_VERSION_MAJOR} VERSION_MAJOR ${KEEPASSXC_VERSION_MAJOR}
VERSION_MINOR ${KEEPASSXC_VERSION_MINOR} VERSION_MINOR ${KEEPASSXC_VERSION_MINOR}
VERSION_PATCH ${KEEPASSXC_VERSION_PATCH} VERSION_PATCH ${KEEPASSXC_VERSION_PATCH}
) )
list(APPEND WIN32_ResourceFiles "${CMAKE_SOURCE_DIR}/share/windows/icon.rc")
endif() endif()
add_executable(${PROGNAME} WIN32 main.cpp ${WIN32_ProductVersionFiles}) add_executable(${PROGNAME} WIN32 main.cpp ${WIN32_ResourceFiles})
target_link_libraries(${PROGNAME} keepassxc_gui) target_link_libraries(${PROGNAME} keepassxc_gui)
set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON) set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON)