Merge lp:~midori/midori/explicitdata into lp:midori

[Cris Dywan]

Re-arrange data file installing to be more explicit

  Skip .ico, .res and .swf.
  And don't ignore files unwanted on Win32 otherwise they
  will be installed in the fallback.

[lp:~midori/midori/explicitdata]

6443. By Cris Dywan on 2013-10-18

Add comment clarifying why .swf is ignored

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-09-14 21:06:41 +0000
+++ data/CMakeLists.txt	2013-10-18 17:34:26 +0000
@@ -16,24 +16,26 @@
 list(REMOVE_ITEM DATA_FILES "CMakeLists.txt")
 
 foreach(FILE ${DATA_FILES})
-    string(FIND ${FILE} "faq." FAQ_FILE)
-    string(FIND ${FILE} "midori." MIDORI_FILE)
-    string(FIND ${FILE} ".desktop" DESKTOP_FILE)
-    string(FIND ${FILE} ".appdata.xml" APPDATA_FILE)
-    string(FIND ${FILE} ".svg" SVG_FILE)
-    if (FAQ_FILE GREATER -1)
+    if (${FILE} MATCHES "faq.")
         install(FILES ${FILE} DESTINATION ${CMAKE_INSTALL_DOCDIR})
-    elseif (DESKTOP_FILE GREATER -1 AND NOT WIN32)
-        string(SUBSTRING ${FILE} 0 ${DESKTOP_FILE} DESKTOP_ID)
-        INTLTOOL_MERGE_DESKTOP (${DESKTOP_ID} po)
-    elseif (APPDATA_FILE GREATER -1 AND NOT WIN32)
-        string(SUBSTRING ${FILE} 0 ${APPDATA_FILE} DESKTOP_ID)
-        INTLTOOL_MERGE_APPDATA (${DESKTOP_ID} po)
-        # install(FILES ${FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/appdata/)
-    elseif (SVG_FILE GREATER -1)
-        string(SUBSTRING ${FILE} 0 ${SVG_FILE} IMG_ID)
+    elseif (${FILE} MATCHES ".desktop")
+        if (NOT WIN32)
+            string(REPLACE ".desktop.in" "" DESKTOP_ID ${FILE})
+            INTLTOOL_MERGE_DESKTOP (${DESKTOP_ID} po)
+        endif ()
+    elseif (${FILE} MATCHES ".appdata.xml")
+        if (NOT WIN32)
+            string(REPLACE ".appdata.xml.in" "" DESKTOP_ID ${FILE})
+            INTLTOOL_MERGE_APPDATA (${DESKTOP_ID} po)
+        endif ()
+    elseif (${FILE} MATCHES ".svg")
+        string(REPLACE ".svg" "" IMG_ID ${FILE})
         SVG2PNG (${IMG_ID} "${CMAKE_INSTALL_DATADIR}/midori/res/")
-    elseif(MIDORI_FILE GREATER -1)
+    # These are being handled in add_executable for the "midori" binary
+    elseif (${FILE} MATCHES ".ico")
+    elseif (${FILE} MATCHES ".rc")
+    # This is only meant for testing, and not used in production
+    elseif (${FILE} MATCHES ".swf")
     else()
         string(FIND ${FILE} "/" IS_DIR)
         if (IS_DIR GREATER -1)