cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / pics / CMakeLists.txt

diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index 2fe3260..78ae93a 100644 (file)
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -1,17 +1,20 @@
 # pics/ contains non-themed icons and other graphical resources
 
-if(WIN32)
-  set(COMMON_DEPS ${COMMON_DEPS} ../pics/win32.rc PARENT_SCOPE)
-endif(WIN32)
+if (WANT_MONO OR WANT_QTCLIENT)
+    quassel_add_resource(Pics PREFIX pics PATTERNS
+        kde-vdg.png
+        quassel-64.svg
+        quassel-eye.png
+        quassel-logo.png
+        quassel-oxygen-32.png
+        qt-logo-32.png
+    )
+endif()
 
-if(WANT_MONO OR WANT_QTCLIENT)
-  if(EMBED_DATA)
-    set(CLIENT_RCS ${CLIENT_RCS} ../pics/pics.qrc PARENT_SCOPE)
-  else(EMBED_DATA)
-    # We don't find them yet externally, so disable installation
-    set(CLIENT_RCS ${CLIENT_RCS} ../pics/pics.qrc PARENT_SCOPE)
-    # install(FILES qt-logo.png
-    #               quassel-large.png
-    #         DESTINATION ${DATA_INSTALL_DIR}/quassel/pics)
-  endif(EMBED_DATA)
-endif(WANT_MONO OR WANT_QTCLIENT)
+# 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)