diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-06-28 17:06:26 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2013-06-28 17:06:26 -0500 |
| commit | 0180339dd65daa9878b93e06ad8da3742999dd3d (patch) | |
| tree | 8ff708bb45c501bca5341daae02ea0a9c630d547 /data | |
| parent | f79e660887abb06169bc6e9b5972ca8dae457357 (diff) | |
| download | ayatana-indicator-session-0180339dd65daa9878b93e06ad8da3742999dd3d.tar.gz ayatana-indicator-session-0180339dd65daa9878b93e06ad8da3742999dd3d.tar.bz2 ayatana-indicator-session-0180339dd65daa9878b93e06ad8da3742999dd3d.zip | |
remove localinstall mode
Diffstat (limited to 'data')
| -rw-r--r-- | data/CMakeLists.txt | 12 |
1 files changed, 2 insertions, 10 deletions
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") |