diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-07-01 19:27:04 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2013-07-01 19:27:04 -0500 |
| commit | 47bd4aebb17b165792c5883e73c99f57d601778b (patch) | |
| tree | 615521a82050a3ee7cbe99ea4ca1a36e55aafac1 | |
| parent | ca86fd5c9dae0ef231394f5b1cf98645c7312f9a (diff) | |
| download | ayatana-indicator-session-47bd4aebb17b165792c5883e73c99f57d601778b.tar.gz ayatana-indicator-session-47bd4aebb17b165792c5883e73c99f57d601778b.tar.bz2 ayatana-indicator-session-47bd4aebb17b165792c5883e73c99f57d601778b.zip | |
in our cmake files, rename PROJECT_LIBEXECDIR as CMAKE_INSTALL_LIBEXECDIR and CMAKE_INSTALL_FULL_LIBEXECDIR for consistency with the other GNUInstallDirs
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 25c2be1..a043d9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,8 +49,9 @@ if (EXISTS "/etc/debian_version") set (CMAKE_INSTALL_LIBEXECDIR "${CMAKE_INSTALL_LIBDIR}") set (CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBDIR}") endif () -set (PROJECT_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") -message (STATUS "${PROJECT_LIBEXECDIR} is the libexec install dir") + +set (CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") +set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") add_subdirectory (src) add_subdirectory (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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7b65629..b327820 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,4 +17,4 @@ link_directories(${SERVICE_LIBRARY_DIRS}) set (SERVICE_EXEC "indicator-session-service") add_executable (${SERVICE_EXEC} main.c) target_link_libraries (${SERVICE_EXEC} libindicatorsessionservice backenddbus ${SERVICE_LIBRARIES} ${GCOV_LIBS}) -install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${PROJECT_LIBEXECDIR}) +install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}) |