From e36ee32def76550135403aac3346e9481af36564 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Thu, 21 Apr 2016 17:15:38 +0000
Subject: [PATCH] freedesktop: move resources to res/.

---
 res/CMakeLists.txt                                 |  13 +++++++++++++
 {src/unix => res/freedesktop}/solvespace-16x16.png | Bin
 {src/unix => res/freedesktop}/solvespace-24x24.png | Bin
 {src/unix => res/freedesktop}/solvespace-32x32.png | Bin
 {src/unix => res/freedesktop}/solvespace-48x48.png | Bin
 {src/unix => res/freedesktop}/solvespace.desktop   |   0
 src/CMakeLists.txt                                 |  11 -----------
 7 files changed, 13 insertions(+), 11 deletions(-)
 rename {src/unix => res/freedesktop}/solvespace-16x16.png (100%)
 rename {src/unix => res/freedesktop}/solvespace-24x24.png (100%)
 rename {src/unix => res/freedesktop}/solvespace-32x32.png (100%)
 rename {src/unix => res/freedesktop}/solvespace-48x48.png (100%)
 rename {src/unix => res/freedesktop}/solvespace.desktop (100%)

diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index 1704a331..53842c09 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -100,6 +100,19 @@ endif()
 if(WIN32)
     add_resource(win32/icon.ico     RT_ICON_GROUP APP_ICON)
     add_resource(win32/manifest.xml RT_MANIFEST   APP_MANIFEST)
+elseif(APPLE)
+else()
+    install(FILES freedesktop/solvespace.desktop
+        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+
+    foreach(SIZE 16x16 24x24 32x32 48x48)
+        install(FILES freedesktop/solvespace-${SIZE}.png
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}/apps
+            RENAME      solvespace.png)
+        install(FILES freedesktop/solvespace-${SIZE}.png
+            DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}/mimetypes
+            RENAME      application.x-solvespace.png)
+    endforeach()
 endif()
 add_resource(banner.txt)
 
diff --git a/src/unix/solvespace-16x16.png b/res/freedesktop/solvespace-16x16.png
similarity index 100%
rename from src/unix/solvespace-16x16.png
rename to res/freedesktop/solvespace-16x16.png
diff --git a/src/unix/solvespace-24x24.png b/res/freedesktop/solvespace-24x24.png
similarity index 100%
rename from src/unix/solvespace-24x24.png
rename to res/freedesktop/solvespace-24x24.png
diff --git a/src/unix/solvespace-32x32.png b/res/freedesktop/solvespace-32x32.png
similarity index 100%
rename from src/unix/solvespace-32x32.png
rename to res/freedesktop/solvespace-32x32.png
diff --git a/src/unix/solvespace-48x48.png b/res/freedesktop/solvespace-48x48.png
similarity index 100%
rename from src/unix/solvespace-48x48.png
rename to res/freedesktop/solvespace-48x48.png
diff --git a/src/unix/solvespace.desktop b/res/freedesktop/solvespace.desktop
similarity index 100%
rename from src/unix/solvespace.desktop
rename to res/freedesktop/solvespace.desktop
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4179de80..0eeac865 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -374,17 +374,6 @@ if(NOT WIN32)
         BUNDLE  DESTINATION .)
 endif()
 
-install(FILES unix/solvespace.desktop
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
-foreach(SIZE 16x16 24x24 32x32 48x48)
-    install(FILES unix/solvespace-${SIZE}.png
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}/apps
-        RENAME      solvespace.png)
-    install(FILES unix/solvespace-${SIZE}.png
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}/mimetypes
-        RENAME      application.x-solvespace.png)
-endforeach()
-
 # valgrind
 
 add_custom_target(solvespace-valgrind