X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=pics%2FCMakeLists.txt;h=75f44aae0f93f9dfab2ca12d434c89902d45d521;hp=14550118e3293a4519e9adf4c225fdfe614ac4f3;hb=9e21879f361dfe9978fb5159664cae352301064b;hpb=b34a29a68afd358a72f34351b122da4e066dfecd

diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index 14550118..75f44aae 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -1,19 +1,26 @@
 # pics/ contains non-themed icons and other graphical resources
 
 if(WIN32)
-    if(MINGW)
-	set(COMMON_DEPS ${COMMON_DEPS} ../pics/win32.o PARENT_SCOPE)
-    else(MINGW)
-	set(COMMON_DEPS ${COMMON_DEPS} ../pics/win32.rc PARENT_SCOPE)
-    endif(MINGW)
+  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(WINDRES_EXECUTABLE)
+  else(MINGW)
+    set(COMMON_DEPS ${COMMON_DEPS} ../../pics/win32.rc PARENT_SCOPE)
+  endif(MINGW)
 endif(WIN32)
 
 if(WANT_MONO OR WANT_QTCLIENT)
   if(EMBED_DATA)
-    set(CLIENT_RCS ${CLIENT_RCS} ../pics/pics.qrc PARENT_SCOPE)
+    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)
+    set(CLIENT_RCS ${CLIENT_RCS} ../../pics/pics.qrc PARENT_SCOPE)
     # install(FILES qt-logo.png
     #               quassel-large.png
     #         DESTINATION ${DATA_INSTALL_DIR}/quassel/pics)