Install desktop files to data

rilian-la-te · Apr 24, 2015 · a732bd7 · a732bd7
1 parent f6f43d0
commit a732bd7
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,6 +5,7 @@ enable_testing ()
 include(GNUInstallDirs)
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
 set (DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/vala-panel")
+set (DATADIR_INSTALL "${CMAKE_INSTALL_DATADIR}/vala-panel")
 set (PKGDATADIR "${DATADIR}")
 set (GETTEXT_PACKAGE "vala-panel")
 set (RELEASE_NAME "Simple Vala panel")
@@ -14,6 +15,7 @@ set (LIBVERSION "0")
 set (SOVERSION 0)
 set (PLUGINS_DIRECTORY "${CMAKE_INSTALL_FULL_LIBDIR}/vala-panel/applets/")
 set (PLUGINS_DATA "${DATADIR}/applets/")
+set (PLUGINS_DATA_INSTALL "${DATADIR_INSTALL}/applets/")
 set (PROFILES_DIR "/${CMAKE_INSTALL_SYSCONFDIR}/xdg/${APPNAME}")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
 set (DOLLAR "$")

diff --git a/applets/core/clock/CMakeLists.txt b/applets/core/clock/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel)
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-base)
diff --git a/applets/core/dirmenu/CMakeLists.txt b/applets/core/dirmenu/CMakeLists.txt
@@ -31,4 +31,4 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel)
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-base)
diff --git a/applets/core/kbled/CMakeLists.txt b/applets/core/kbled/CMakeLists.txt
@@ -35,4 +35,4 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel)
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-base)
diff --git a/applets/core/launchbar/CMakeLists.txt b/applets/core/launchbar/CMakeLists.txt
@@ -35,4 +35,4 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel)
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-base)
diff --git a/applets/core/menumodel/CMakeLists.txt b/applets/core/menumodel/CMakeLists.txt
@@ -36,4 +36,4 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel)
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-base)
diff --git a/applets/core/separator/CMakeLists.txt b/applets/core/separator/CMakeLists.txt
@@ -29,4 +29,4 @@ target_link_libraries (${PLUGIN_NAME} ${LIBS} valapanel)
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-base)
diff --git a/applets/drawing/cpu/CMakeLists.txt b/applets/drawing/cpu/CMakeLists.txt
@@ -32,4 +32,4 @@ target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS})
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-base)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-base)
diff --git a/applets/wnck/deskno/CMakeLists.txt b/applets/wnck/deskno/CMakeLists.txt
@@ -33,4 +33,4 @@ target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS})
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-wnck)
diff --git a/applets/wnck/pager/CMakeLists.txt b/applets/wnck/pager/CMakeLists.txt
@@ -33,4 +33,4 @@ target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS})
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-wnck)
diff --git a/applets/wnck/tasklist/CMakeLists.txt b/applets/wnck/tasklist/CMakeLists.txt
@@ -32,4 +32,4 @@ target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS})
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-wnck)
diff --git a/applets/wnck/wincmd/CMakeLists.txt b/applets/wnck/wincmd/CMakeLists.txt
@@ -33,4 +33,4 @@ target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS})
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-wnck)
diff --git a/applets/wnck/xembed/CMakeLists.txt b/applets/wnck/xembed/CMakeLists.txt
@@ -36,4 +36,4 @@ target_include_directories (${PLUGIN_NAME} PRIVATE ${LIB_PATHS})
 
 # Install plugin stuffs
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DIRECTORY} COMPONENT plugins-wnck)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.plugin DESTINATION ${PLUGINS_DATA_INSTALL} COMPONENT plugins-wnck)
diff --git a/data/images/CMakeLists.txt b/data/images/CMakeLists.txt
@@ -1,2 +1,2 @@
 install(FILES panel.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME vala-panel.svg COMPONENT bin)
-install(FILES background.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vala-panel/images COMPONENT bin)
+install(FILES background.png DESTINATION ${DATADIR_INSTALL}/images COMPONENT bin)