From 46bba99808aad823adc53744e6d93f5af9bf729d Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 22 Aug 2018 00:29:17 +0200
Subject: [PATCH] cmake: Build Windows icon resource again

Building the Windows resource got lost while refactoring the build
system, so bring it back.
---
 pics/CMakeLists.txt     | 15 ---------------
 src/main/CMakeLists.txt | 24 +++++++++++++++++++++---
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index 0cd43f63..6490ad17 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -1,20 +1,5 @@
 # pics/ contains non-themed icons and other graphical resources
 
-if(WIN32)
-  if(MINGW)
-    find_program(WINDRES_EXECUTABLE NAMES windres)
-    if(WINDRES_EXECUTABLE)
-      exec_program(windres
-              ARGS "-i ${CMAKE_CURRENT_SOURCE_DIR}/win32.rc"
-                   "-o ${CMAKE_CURRENT_BINARY_DIR}/win32.o"
-                   "--include-dir=${CMAKE_CURRENT_SOURCE_DIR}")
-      set(COMMON_DEPS ${COMMON_DEPS} ${CMAKE_CURRENT_BINARY_DIR}/win32.o PARENT_SCOPE)
-    endif()
-  else()
-    set(COMMON_DEPS ${COMMON_DEPS} ${CMAKE_CURRENT_SOURCE_DIR}/win32.rc PARENT_SCOPE)
-  endif()
-endif()
-
 if (WANT_MONO OR WANT_QTCLIENT)
     quassel_add_resource(Pics PREFIX pics PATTERNS
         kde-vdg.png
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 03674672..b8a41402 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -21,14 +21,32 @@ if (WITH_BUNDLED_ICONS)
     set_property(SOURCE main.cpp APPEND PROPERTY COMPILE_DEFINITIONS WITH_BUNDLED_ICONS)
 endif()
 
+# Windows icon resource
+if(WIN32)
+    if(MINGW)
+        find_program(WINDRES_EXECUTABLE NAMES windres)
+        if(WINDRES_EXECUTABLE)
+            exec_program(windres
+                ARGS "-i ${CMAKE_SOURCE_DIR}/pics/win32.rc"
+                     "-o ${CMAKE_CURRENT_BINARY_DIR}/win32.o"
+                     "--include-dir=${CMAKE_SOURCE_DIR}/pics"
+                )
+            set(WIN_RC ${CMAKE_CURRENT_BINARY_DIR}/win32.o)
+        endif()
+    else()
+        set(WIN_RC ${CMAKE_SOURCE_DIR}/pics/win32.rc)
+    endif()
+endif()
+
+
 # Build the executables
 if (WANT_CORE)
-    add_executable(quasselcore main.cpp)
+    add_executable(quasselcore main.cpp ${WIN_RC})
     setup_executable(quasselcore -DBUILD_CORE Qt5::Core Quassel::Core)
 endif()
 
 if (WANT_CLIENT OR WANT_QTCLIENT)
-    add_executable(quasselclient WIN32 main.cpp)
+    add_executable(quasselclient WIN32 main.cpp ${WIN_RC})
     setup_executable(quasselclient -DBUILD_QTUI Qt5::Core Qt5::Gui Quassel::QtUi)
     if (WITH_KDE)
         target_link_libraries(quasselclient PRIVATE KF5::CoreAddons)
@@ -36,7 +54,7 @@ if (WANT_CLIENT OR WANT_QTCLIENT)
 endif()
 
 if (WANT_MONO)
-    add_executable(quassel WIN32 main.cpp monoapplication.cpp)
+    add_executable(quassel WIN32 main.cpp monoapplication.cpp ${WIN_RC})
     setup_executable(quassel -DBUILD_MONO Qt5::Core Qt5::Gui Quassel::Core Quassel::QtUi)
     if (WITH_KDE)
         target_link_libraries(quassel PRIVATE KF5::CoreAddons)
-- 
2.20.1