r21226 by mrdocs -

scribus-commit scribus-commit at lists.scribus.net
Sun Apr 24 03:23:40 UTC 2016


Author: mrdocs
Date: Sun Apr 24 03:23:39 2016
New Revision: 21226

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21226
Log:
Part of https://bugs.scribus.net/view.php?id=12708

Modified:
    branches/Version14x/Scribus/CMakeLists.txt

Modified: branches/Version14x/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21226&path=/branches/Version14x/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version14x/Scribus/CMakeLists.txt	(original)
+++ branches/Version14x/Scribus/CMakeLists.txt	Sun Apr 24 03:23:39 2016
@@ -354,6 +354,15 @@
 ELSE()
     ADD_DEFINITIONS("-DDESKTOPDIR=\\\"${DESKTOPDIR}\\\"")
 ENDIF()
+
+#APPDATA
+SET(APPDATADIR "${CMAKE_INSTALL_DATAROOTDIR}/appdata/")
+IF(NOT IS_ABSOLUTE ${APPDATADIRR})
+    ADD_DEFINITIONS("-DAPPDATADIR=\\\"${CMAKE_INSTALL_PREFIX}/${APPDATADIR}\\\"")
+ELSE()
+    ADD_DEFINITIONS("-DAPPDATADIR=\\\"${APPDATADIR}\\\"")
+ENDIF()
+
 
 # APPLICATION_DATA_DIR
 # It allows specify the user configuration directory in the compile time.
@@ -945,12 +954,22 @@
   DESTINATION ${MIMELNKDIR}
 )
 
-## PL We may not need this anymore
+
 #Install the desktop file
-## INSTALL(FILES
- # scribus.desktop
- # #DESTINATION ${DESKTOPDIR}
-#)
+INSTALL(FILES
+scribus.desktop
+DESTINATION ${DESKTOPDIR}
+)
+
+)
+
+
+#Install the appdata file
+INSTALL(FILES
+scribus.appdata.xml
+DESTINATION ${APPDATADIR}
+)
+
 
 #If building an Apple bundle, install these specific files
 IF(APPLEBUNDLE)




More information about the scribus-commit mailing list