From 76b83654e03a2ec56e306d44f565e2a90b4a6d18 Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Sat, 11 Jan 2025 13:54:51 +0100 Subject: [PATCH] Set executable icon On Windows, the executable icon is important since it is also inherited by CPACK_NSIS_INSTALLED_ICON_NAME [1] and CPACK_PACKAGE_EXECUTABLES. [2] [1]: https://cmake.org/cmake/help/latest/cpack_gen/nsis.html#variable:CPACK_NSIS_INSTALLED_ICON_NAME [2]: https://cmake.org/cmake/help/latest/module/CPack.html#variable:CPACK_PACKAGE_EXECUTABLES --- cmake/speed-dreams-2.rc.in.cmake | 1 + src/main/CMakeLists.txt | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 cmake/speed-dreams-2.rc.in.cmake diff --git a/cmake/speed-dreams-2.rc.in.cmake b/cmake/speed-dreams-2.rc.in.cmake new file mode 100644 index 000000000..2e857c592 --- /dev/null +++ b/cmake/speed-dreams-2.rc.in.cmake @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "${SD_DATADIR_ABS}/data/icons/icon.ico" diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index 5c487fba4..a299adf89 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -9,6 +9,12 @@ IF(MSVC) SET(_SOURCES ${_SOURCES} main.rc resource.h ../../data/data/icons/icon.ico) ENDIF(MSVC) +IF(SD_HAS_DATADIR AND NOT SD_ASSUME_DATADIR) + configure_file(${CMAKE_SOURCE_DIR}/cmake/${PROJECT_NAME}.rc.in.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.rc) + SET(_SOURCES ${_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.rc) +ENDIF() + ADD_INTERFACE_INCLUDEDIR() ADD_SDLIB_INCLUDEDIR(tgf tgfclient tgfdata math portability)