Fix QSyncthingTray executable not having an icon on Windows

sieren · May 25, 2017 · 04497ee · 04497ee
1 parent bbeb0de
commit 04497ee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -70,6 +70,13 @@ source_group("Platforms" ${qst_platform_HEADERS} ${qst_PLATFORMS_SOURCES})
 # |_|   \__,_|\__|_| |_|___/
 #
 
+if (WIN32)
+    set(ICON_FILE "resources/windows_metafile.rc")
+    set(CMAKE_RC_COMPILER_INIT windres)
+    ENABLE_LANGUAGE(RC)
+    SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+endif()
+
 # qt5_wrap_ui(UI_HEADERS mainwindow.ui)
 qt5_add_resources(UI_RESOURCES
   resources/qsyncthing.qrc
@@ -92,7 +99,7 @@ add_subdirectory(sources)
     set_target_properties(QSyncthingTray PROPERTIES
         MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/resources/Info.template.plist)
   elseif(WIN32)
-    add_executable(QSyncthingTray WIN32 ${UI_HEADERS} ${UI_RESOURCES} ${qst_platform_HEADERS} ${qst_HEADERS} ${qst_SOURCES})
+    add_executable(QSyncthingTray WIN32 ${ICON_FILE} ${UI_HEADERS} ${UI_RESOURCES} ${qst_platform_HEADERS} ${qst_HEADERS} ${qst_SOURCES})
   elseif(UNIX)
     add_executable(QSyncthingTray ${UI_HEADERS} ${UI_RESOURCES} ${qst_platform_HEADERS} ${qst_HEADERS} ${qst_SOURCES})
   endif()

diff --git a/resources/Syncthing.ico b/resources/Syncthing.ico
diff --git a/resources/windows_metafile.rc b/resources/windows_metafile.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "Syncthing.ico"