cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / pics / CMakeLists.txt

diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index 0cd43f6..78ae93a 100644 (file)
--- 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
@@ -22,7 +7,14 @@ if (WANT_MONO OR WANT_QTCLIENT)
         quassel-eye.png
         quassel-logo.png
         quassel-oxygen-32.png
-        qt-logo.png
         qt-logo-32.png
     )
 endif()
+
+# On macOS, the individual icons should be converted into an iconset
+add_custom_command(
+    COMMENT "Creating iconset for macOS"
+    OUTPUT quassel.icns
+    COMMAND iconutil ARGS -c icns -o ${CMAKE_CURRENT_BINARY_DIR}/quassel.icns ${CMAKE_CURRENT_SOURCE_DIR}/quassel.iconset
+)
+add_custom_target(MacOsIcons DEPENDS quassel.icns)