From d782f784d486fd726a870fb9c03e49bd6ef6877c Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 22 Mar 2013 16:59:19 -0500 Subject: add data/CMakeLists.txt to the repo --- data/CMakeLists.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 data/CMakeLists.txt (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 0000000..7d213b2 --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,23 @@ +# schema +configure_file (com.canonical.indicator.session.gschema.xml.in + com.canonical.indicator.session.gschema.xml) +include (GSettings) +add_schemas(clinica-schemas ${CMAKE_SOURCE_DIR}/data/com.canonical.indicator.session.gschema.xml) + +# .service file +include (GNUInstallDirs) +configure_file (indicator-session.service.in indicator-session.service) + +# .indicator file +# (NOOP) +# +# FIXME install files +#install(FILES +#${CMAKE_CURRENT_BINARY_DIR}/indicator-datetime.service +#DESTINATION share/indicator-datetime # FIXME to be the real install dir. +#) +# +#install(FILES +#datetime-dialog.ui +#DESTINATION share/indicatore-datetime # FIXME this too. +#) -- cgit v1.2.3 From 08be3e1b81cb6ba58073929be8121acb37078680 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 18 Apr 2013 12:41:55 -0500 Subject: add session.indicator to data/ --- data/session.indicator | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/session.indicator (limited to 'data') diff --git a/data/session.indicator b/data/session.indicator new file mode 100644 index 0000000..b5f6802 --- /dev/null +++ b/data/session.indicator @@ -0,0 +1,4 @@ +[Indicator Service] +Name=indicator-session +BusName=com.canonical.indicator.session-test +ObjectPath=/com/canonical/indicator/session -- cgit v1.2.3 From 4df0aceb48e9b3d6c77f6e06c7acde89747ff878 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 19 Jun 2013 18:27:08 -0500 Subject: use the production dbus name --- data/com.canonical.indicator.session | 10 ++++++++++ data/session.indicator | 4 ---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 data/com.canonical.indicator.session delete mode 100644 data/session.indicator (limited to 'data') diff --git a/data/com.canonical.indicator.session b/data/com.canonical.indicator.session new file mode 100644 index 0000000..fce3554 --- /dev/null +++ b/data/com.canonical.indicator.session @@ -0,0 +1,10 @@ +[Indicator Service] +Name=indicator-session +ObjectPath=/com/canonical/indicator/session + +[desktop] +ObjectPath=/com/canonical/indicator/session/desktop + +[greeter] +ObjectPath=/com/canonical/indicator/session/greeter + diff --git a/data/session.indicator b/data/session.indicator deleted file mode 100644 index b5f6802..0000000 --- a/data/session.indicator +++ /dev/null @@ -1,4 +0,0 @@ -[Indicator Service] -Name=indicator-session -BusName=com.canonical.indicator.session-test -ObjectPath=/com/canonical/indicator/session -- cgit v1.2.3 From 22e72bb60a789ba3a48aff737c8816908695b408 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 20 Jun 2013 14:13:28 -0500 Subject: install the .indicator file into the unity/indicators/ dir --- data/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 7d213b2..c00b8db 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -9,8 +9,9 @@ include (GNUInstallDirs) configure_file (indicator-session.service.in indicator-session.service) # .indicator file -# (NOOP) -# +install(FILES com.canonical.indicator.session + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/unity/indicators) + # FIXME install files #install(FILES #${CMAKE_CURRENT_BINARY_DIR}/indicator-datetime.service -- cgit v1.2.3 From a5fb857ee48a9022eb1e6c9ea04e0aeff80f445b Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 20 Jun 2013 14:43:23 -0500 Subject: cmake work: properly generate and install the .service file for dbus activation --- data/CMakeLists.txt | 12 ++++++------ data/indicator-session.service.in | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index c00b8db..84fe66c 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -5,18 +5,18 @@ include (GSettings) add_schemas(clinica-schemas ${CMAKE_SOURCE_DIR}/data/com.canonical.indicator.session.gschema.xml) # .service file -include (GNUInstallDirs) -configure_file (indicator-session.service.in indicator-session.service) +set(SERVICE_NAME "indicator-session.service") +set(SERVICE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}") +set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/indicator-session") +configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in" "${SERVICE_PATH}") +install (FILES ${SERVICE_PATH} + DESTINATION ${DBUSSERVICEDIR}) # .indicator file install(FILES com.canonical.indicator.session DESTINATION ${CMAKE_INSTALL_PREFIX}/share/unity/indicators) # FIXME install files -#install(FILES -#${CMAKE_CURRENT_BINARY_DIR}/indicator-datetime.service -#DESTINATION share/indicator-datetime # FIXME to be the real install dir. -#) # #install(FILES #datetime-dialog.ui diff --git a/data/indicator-session.service.in b/data/indicator-session.service.in index a4d10a1..e520e20 100644 --- a/data/indicator-session.service.in +++ b/data/indicator-session.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=com.canonical.indicator.session -Exec=@libexecdir@/indicator-session-service +Exec=@pkglibexecdir@/indicator-session-service -- cgit v1.2.3 From 6def7fceae5ea55e6d44ede05146f6a95add317c Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 20 Jun 2013 17:31:07 -0500 Subject: install .schema.xml and indicator-session-service in the right places. --- data/CMakeLists.txt | 66 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 24 deletions(-) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 84fe66c..d8f338b 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,24 +1,42 @@ -# schema -configure_file (com.canonical.indicator.session.gschema.xml.in - com.canonical.indicator.session.gschema.xml) -include (GSettings) -add_schemas(clinica-schemas ${CMAKE_SOURCE_DIR}/data/com.canonical.indicator.session.gschema.xml) - -# .service file -set(SERVICE_NAME "indicator-session.service") -set(SERVICE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}") -set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/indicator-session") -configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in" "${SERVICE_PATH}") -install (FILES ${SERVICE_PATH} - DESTINATION ${DBUSSERVICEDIR}) - -# .indicator file -install(FILES com.canonical.indicator.session - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/unity/indicators) - -# FIXME install files -# -#install(FILES -#datetime-dialog.ui -#DESTINATION share/indicatore-datetime # FIXME this too. -#) +## +## GSettings schema +## + +set (SCHEMA_NAME "com.canonical.indicator.session.gschema.xml") +set (SCHEMA_PATH "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}") +set (SCHEMA_PATH_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in") + +# generate the .xml file using intltool +set (ENV{LC_ALL} "C") +execute_process (COMMAND intltool-merge -x -u --no-translations ${SCHEMA_PATH_IN} ${SCHEMA_PATH}) + +# let UseGSettings do the rest +add_schema (${SCHEMA_PATH}) + + +## +## DBus Service File +## + +set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service") +set (SERVICE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}") +set (SERVICE_PATH_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in") + +# build it +set (pkglibexecdir "${PROJECT_LIBEXECDIR}") +configure_file ("${SERVICE_PATH_IN}" "${SERVICE_PATH}") + +# install it +install (FILES ${SERVICE_PATH} DESTINATION ${DBUSSERVICEDIR}) + + +## +## Unity Indicator File +## + +set (UNITY_INDICATOR_NAME "com.canonical.indicator.session") +set (UNITY_INDICATOR_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}") +set (UNITY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share/unity") + +install (FILES ${UNITY_INDICATOR_PATH} DESTINATION "${UNITY_INSTALL_PREFIX}/indicators") + -- cgit v1.2.3 From 452ac8d007d55ef282546c0ee3871bf50dd49917 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 20 Jun 2013 18:06:06 -0500 Subject: add cmake rules to install the icon files --- data/CMakeLists.txt | 15 +++++++++++++++ data/Makefile.am | 27 --------------------------- data/icons/16x16/Makefile.am | 1 - data/icons/16x16/actions/Makefile.am | 9 --------- data/icons/16x16/status/Makefile.am | 7 ------- data/icons/22x22/Makefile.am | 1 - data/icons/22x22/actions/Makefile.am | 9 --------- data/icons/22x22/status/Makefile.am | 7 ------- data/icons/24x24/Makefile.am | 1 - data/icons/24x24/actions/Makefile.am | 9 --------- data/icons/24x24/status/Makefile.am | 7 ------- data/icons/32x32/Makefile.am | 1 - data/icons/32x32/actions/Makefile.am | 8 -------- data/icons/32x32/status/Makefile.am | 7 ------- data/icons/Makefile.am | 15 --------------- data/icons/scalable/Makefile.am | 1 - data/icons/scalable/actions/Makefile.am | 9 --------- data/icons/scalable/status/Makefile.am | 7 ------- 18 files changed, 15 insertions(+), 126 deletions(-) delete mode 100644 data/Makefile.am delete mode 100644 data/icons/16x16/Makefile.am delete mode 100644 data/icons/16x16/actions/Makefile.am delete mode 100644 data/icons/16x16/status/Makefile.am delete mode 100644 data/icons/22x22/Makefile.am delete mode 100644 data/icons/22x22/actions/Makefile.am delete mode 100644 data/icons/22x22/status/Makefile.am delete mode 100644 data/icons/24x24/Makefile.am delete mode 100644 data/icons/24x24/actions/Makefile.am delete mode 100644 data/icons/24x24/status/Makefile.am delete mode 100644 data/icons/32x32/Makefile.am delete mode 100644 data/icons/32x32/actions/Makefile.am delete mode 100644 data/icons/32x32/status/Makefile.am delete mode 100644 data/icons/Makefile.am delete mode 100644 data/icons/scalable/Makefile.am delete mode 100644 data/icons/scalable/actions/Makefile.am delete mode 100644 data/icons/scalable/status/Makefile.am (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index d8f338b..de6942d 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -40,3 +40,18 @@ set (UNITY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share/unity") install (FILES ${UNITY_INDICATOR_PATH} DESTINATION "${UNITY_INSTALL_PREFIX}/indicators") + +## +## Icons +## + +if(${LOCAL_INSTALL}) + set (ICON_PREFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/libindicator/icons/") +else() + EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE ICON_PREFIX) +endif() +set (ICON_DIR "${ICON_PREFIX}/hicolor") +message ("Installing icons to ${ICON_DIR}") +install (DIRECTORY icons + DESTINATION ${ICON_DIR} + FILES_MATCHING PATTERN "*.png" PATTERN "*.svg") diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 27b5ea2..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -SUBDIRS = \ - icons \ - extra-sessions - -dbus_servicesdir = $(DBUSSERVICEDIR) -service_in_files = indicator-session.service.in -dbus_services_DATA = $(service_in_files:.service.in=.service) - -%.service: %.service.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - -@INTLTOOL_SCHEMAS_RULE@ -@INTLTOOL_XML_NOMERGE_RULE@ - -@GSETTINGS_RULES@ -gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml - -convertdir = $(datadir)/GConf/gsettings -dist_convert_DATA = indicator-session.convert - -EXTRA_DIST = \ - $(service_in_files) \ - $(gsettings_SCHEMAS:.xml=.xml.in) - -CLEANFILES = \ - $(dbus_services_DATA) \ - $(gsettings_SCHEMAS) diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am deleted file mode 100644 index c163076..0000000 --- a/data/icons/16x16/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = actions status diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am deleted file mode 100644 index 5aa276c..0000000 --- a/data/icons/16x16/actions/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/actions - -icons_DATA = \ - system-shutdown.png \ - system-restart.png \ - system-log-out.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am deleted file mode 100644 index c0af60e..0000000 --- a/data/icons/16x16/status/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status - -icons_DATA = \ - account-logged-in.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am deleted file mode 100644 index c163076..0000000 --- a/data/icons/22x22/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = actions status diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am deleted file mode 100644 index 73cdd09..0000000 --- a/data/icons/22x22/actions/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/actions - -icons_DATA = \ - system-shutdown.png \ - system-restart.png \ - system-log-out.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am deleted file mode 100644 index 1ce0fa1..0000000 --- a/data/icons/22x22/status/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status - -icons_DATA = \ - account-logged-in.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am deleted file mode 100644 index c163076..0000000 --- a/data/icons/24x24/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = actions status diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am deleted file mode 100644 index 55c63d1..0000000 --- a/data/icons/24x24/actions/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/actions - -icons_DATA = \ - system-shutdown.png \ - system-restart.png \ - system-log-out.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am deleted file mode 100644 index 4fa065a..0000000 --- a/data/icons/24x24/status/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status - -icons_DATA = \ - account-logged-in.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am deleted file mode 100644 index c163076..0000000 --- a/data/icons/32x32/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = actions status diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am deleted file mode 100644 index 74c2c8d..0000000 --- a/data/icons/32x32/actions/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/actions - -icons_DATA = \ - system-restart.png \ - system-log-out.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am deleted file mode 100644 index b852725..0000000 --- a/data/icons/32x32/status/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status - -icons_DATA = \ - account-logged-in.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100644 index 7394c73..0000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -SUBDIRS = scalable 16x16 22x22 24x24 32x32 - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(INDICATORICONSDIR)/hicolor - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am deleted file mode 100644 index c163076..0000000 --- a/data/icons/scalable/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = actions status diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am deleted file mode 100644 index 39b4177..0000000 --- a/data/icons/scalable/actions/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/actions - -icons_DATA = \ - system-restart.svg \ - system-log-out.svg \ - system-shutdown.svg - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am deleted file mode 100644 index cb006e2..0000000 --- a/data/icons/scalable/status/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status - -icons_DATA = \ - account-logged-in.svg - -EXTRA_DIST = $(icons_DATA) -- cgit v1.2.3 From 3d4daff706c39fb6ebdd29b950f3f0ea1402116d Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 20 Jun 2013 18:44:26 -0500 Subject: cmake: fix variables in data/CMakeLists.txt, make status messages more consistent --- data/CMakeLists.txt | 52 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 18 deletions(-) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index de6942d..91f79a5 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,55 +3,71 @@ ## set (SCHEMA_NAME "com.canonical.indicator.session.gschema.xml") -set (SCHEMA_PATH "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}") -set (SCHEMA_PATH_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in") +set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}") +set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in") # generate the .xml file using intltool set (ENV{LC_ALL} "C") -execute_process (COMMAND intltool-merge -x -u --no-translations ${SCHEMA_PATH_IN} ${SCHEMA_PATH}) +execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${SCHEMA_FILE_IN}" "${SCHEMA_FILE}") # let UseGSettings do the rest -add_schema (${SCHEMA_PATH}) +add_schema (${SCHEMA_FILE}) ## ## DBus Service File ## +# where to install +if (${LOCAL_INSTALL}) + set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/dbus-1/services") +else () + EXEC_PROGRAM (${PKG_CONFIG_EXECUTABLE} ARGS dbus-1 --variable session_bus_services_dir OUTPUT_VARIABLE DBUS_SERVICE_DIR) +endif () +message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir") + set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service") -set (SERVICE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}") -set (SERVICE_PATH_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in") +set (SERVICE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}") +set (SERVICE_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in") # build it set (pkglibexecdir "${PROJECT_LIBEXECDIR}") -configure_file ("${SERVICE_PATH_IN}" "${SERVICE_PATH}") +configure_file ("${SERVICE_FILE_IN}" "${SERVICE_FILE}") # install it -install (FILES ${SERVICE_PATH} DESTINATION ${DBUSSERVICEDIR}) +install (FILES "${SERVICE_FILE}" + DESTINATION "${DBUS_SERVICE_DIR}") ## ## Unity Indicator File ## +# where to install +set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_PREFIX}/share/unity/indicators") +message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir") + set (UNITY_INDICATOR_NAME "com.canonical.indicator.session") -set (UNITY_INDICATOR_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}") -set (UNITY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share/unity") +set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}") -install (FILES ${UNITY_INDICATOR_PATH} DESTINATION "${UNITY_INSTALL_PREFIX}/indicators") +install (FILES "${UNITY_INDICATOR_FILE}" + DESTINATION "${UNITY_INDICATOR_DIR}") ## ## Icons ## -if(${LOCAL_INSTALL}) - set (ICON_PREFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/libindicator/icons/") -else() - EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE ICON_PREFIX) -endif() +# where to install +if (${LOCAL_INSTALL}) + set (ICON_PREFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/libindicator/icons") +else () + EXEC_PROGRAM (${PKG_CONFIG_EXECUTABLE} ARGS indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE ICON_PREFIX) +endif () set (ICON_DIR "${ICON_PREFIX}/hicolor") -message ("Installing icons to ${ICON_DIR}") +message (STATUS "${ICON_DIR} is the Icon install dir") + install (DIRECTORY icons - DESTINATION ${ICON_DIR} + DESTINATION "${ICON_DIR}" FILES_MATCHING PATTERN "*.png" PATTERN "*.svg") + -- cgit v1.2.3 From 094ca7d7986027571672cfbcc955310afa6af336 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 20 Jun 2013 19:02:55 -0500 Subject: add a post-install hook to update the icon cache after installation. Taken from geary/icons/CMakeLists.txt. (Thanks, Eric!) --- data/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 91f79a5..6700163 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -71,3 +71,6 @@ install (DIRECTORY icons DESTINATION "${ICON_DIR}" FILES_MATCHING PATTERN "*.png" PATTERN "*.svg") +install(CODE "execute_process (COMMAND gtk-update-icon-cache -t -f ${ICON_DIR})" + CODE "message (STATUS \"Updating icon cache\")") + -- cgit v1.2.3 From 0180339dd65daa9878b93e06ad8da3742999dd3d Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 28 Jun 2013 17:06:26 -0500 Subject: remove localinstall mode --- data/CMakeLists.txt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 6700163..6eb257c 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -19,11 +19,7 @@ add_schema (${SCHEMA_FILE}) ## # where to install -if (${LOCAL_INSTALL}) - set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/dbus-1/services") -else () - EXEC_PROGRAM (${PKG_CONFIG_EXECUTABLE} ARGS dbus-1 --variable session_bus_services_dir OUTPUT_VARIABLE DBUS_SERVICE_DIR) -endif () +set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/dbus-1/services") message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir") set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service") @@ -59,11 +55,7 @@ install (FILES "${UNITY_INDICATOR_FILE}" ## # where to install -if (${LOCAL_INSTALL}) - set (ICON_PREFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/libindicator/icons") -else () - EXEC_PROGRAM (${PKG_CONFIG_EXECUTABLE} ARGS indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE ICON_PREFIX) -endif () +set (ICON_PREFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/libindicator/icons") set (ICON_DIR "${ICON_PREFIX}/hicolor") message (STATUS "${ICON_DIR} is the Icon install dir") -- cgit v1.2.3 From 695aba24f30be53f291c52ef42f2dce76fb656cf Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 1 Jul 2013 18:38:37 -0500 Subject: in data/CMakeLists.txt, install icons/' subdirectories, not the icons/ directory itself. --- data/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 6eb257c..e37f647 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -60,6 +60,11 @@ set (ICON_DIR "${ICON_PREFIX}/hicolor") message (STATUS "${ICON_DIR} is the Icon install dir") install (DIRECTORY icons + icons/16x16 + icons/22x22 + icons/24x24 + icons/32x32 + icons/scalable DESTINATION "${ICON_DIR}" FILES_MATCHING PATTERN "*.png" PATTERN "*.svg") -- cgit v1.2.3 From 6ee61b9bb4d92e5c9a41d2259e879486ec0d730a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 1 Jul 2013 18:39:09 -0500 Subject: in data/CMakeLists.txt, install icons into the standard hicolor directory, rather than a custom libindicator hicolor directory, as discussed with ted and lars in #systems --- data/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index e37f647..335582c 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -55,8 +55,7 @@ install (FILES "${UNITY_INDICATOR_FILE}" ## # where to install -set (ICON_PREFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/libindicator/icons") -set (ICON_DIR "${ICON_PREFIX}/hicolor") +set (ICON_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/icons/hicolor") message (STATUS "${ICON_DIR} is the Icon install dir") install (DIRECTORY icons -- cgit v1.2.3 From 477dc6fa22bcd37b23deb45b57bec6518ba52ad9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 1 Jul 2013 19:02:47 -0500 Subject: in the cmake files, prefer the _FULL versions of the GNU variables --- data/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 335582c..3ddf422 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -19,7 +19,7 @@ add_schema (${SCHEMA_FILE}) ## # where to install -set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/dbus-1/services") +set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services") message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir") set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service") @@ -40,7 +40,7 @@ install (FILES "${SERVICE_FILE}" ## # where to install -set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_PREFIX}/share/unity/indicators") +set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators") message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir") set (UNITY_INDICATOR_NAME "com.canonical.indicator.session") -- cgit v1.2.3 From 47bd4aebb17b165792c5883e73c99f57d601778b Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 1 Jul 2013 19:27:04 -0500 Subject: in our cmake files, rename PROJECT_LIBEXECDIR as CMAKE_INSTALL_LIBEXECDIR and CMAKE_INSTALL_FULL_LIBEXECDIR for consistency with the other GNUInstallDirs --- data/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 3ddf422..3aa8ce4 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -27,7 +27,7 @@ set (SERVICE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}") set (SERVICE_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in") # build it -set (pkglibexecdir "${PROJECT_LIBEXECDIR}") +set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") configure_file ("${SERVICE_FILE_IN}" "${SERVICE_FILE}") # install it -- cgit v1.2.3 From e875abf22fc02939185b6aa881865cff58fc1543 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 1 Jul 2013 21:00:17 -0500 Subject: in cmake files, limit scopes by moving single-target properties out of the global variables to single-target ones and moving single-use includes into the directories where they're used --- data/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 3aa8ce4..ac4e76c 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,3 +1,5 @@ +include (UseGSettings) + ## ## GSettings schema ## -- cgit v1.2.3 From d95cce515fb4c1e04ef3e9d7363102996cc00d09 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 2 Jul 2013 09:35:15 -0500 Subject: in the .indicator file, add a Position entry --- data/com.canonical.indicator.session | 1 + 1 file changed, 1 insertion(+) (limited to 'data') diff --git a/data/com.canonical.indicator.session b/data/com.canonical.indicator.session index fce3554..81ade06 100644 --- a/data/com.canonical.indicator.session +++ b/data/com.canonical.indicator.session @@ -1,6 +1,7 @@ [Indicator Service] Name=indicator-session ObjectPath=/com/canonical/indicator/session +Position=10 [desktop] ObjectPath=/com/canonical/indicator/session/desktop -- cgit v1.2.3 From 4a0ba3437a459dce84c24f574302aa57711f9eb5 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 5 Jul 2013 07:18:55 -0500 Subject: make the desktop name consistent everywhere: 'desktop_greeter' --- data/com.canonical.indicator.session | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/com.canonical.indicator.session b/data/com.canonical.indicator.session index 81ade06..28f11a0 100644 --- a/data/com.canonical.indicator.session +++ b/data/com.canonical.indicator.session @@ -6,6 +6,6 @@ Position=10 [desktop] ObjectPath=/com/canonical/indicator/session/desktop -[greeter] +[desktop_greeter] ObjectPath=/com/canonical/indicator/session/greeter -- cgit v1.2.3 From d7248cf9ca466a9a3fbb9c722ad7029f9150fd0d Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 5 Jul 2013 07:24:39 -0500 Subject: make the desktop greeter menu's name consistent across indicators: 'desktop_greeter' --- data/com.canonical.indicator.session | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/com.canonical.indicator.session b/data/com.canonical.indicator.session index 28f11a0..7b1b39e 100644 --- a/data/com.canonical.indicator.session +++ b/data/com.canonical.indicator.session @@ -7,5 +7,5 @@ Position=10 ObjectPath=/com/canonical/indicator/session/desktop [desktop_greeter] -ObjectPath=/com/canonical/indicator/session/greeter +ObjectPath=/com/canonical/indicator/session/desktop_greeter -- cgit v1.2.3