diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-10 21:56:24 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-10 21:56:24 +0200 |
| commit | 95a9f27ded2d367c7af4944172405fa5c47a9eae (patch) | |
| tree | 9deb1f4d9a8c445502471a55e7084c457b065c70 /src | |
| parent | 71205eed40a661280eaffbd8e7f5679b1e634a76 (diff) | |
| parent | d4cf711a5405e217f933dc170d75e6118c287fff (diff) | |
| download | ayatana-indicator-application-95a9f27ded2d367c7af4944172405fa5c47a9eae.tar.gz ayatana-indicator-application-95a9f27ded2d367c7af4944172405fa5c47a9eae.tar.bz2 ayatana-indicator-application-95a9f27ded2d367c7af4944172405fa5c47a9eae.zip | |
Merge branch 'tari01-pr/cmake-install-full'
Attributes GH PR #13: https://github.com/AyatanaIndicators/ayatana-indicator-application/pull/13
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e328688..1de3abd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,7 +88,7 @@ target_include_directories("ayatana-application" PUBLIC ${PROJECT_DEPS_INCLUDE_D target_include_directories("ayatana-application" PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries("ayatana-application" ${PROJECT_DEPS_LIBRARIES}) add_dependencies("ayatana-application" "src-generated") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-application.so" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/ayatana-indicators3/7") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libayatana-application.so" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/ayatana-indicators3/7") # ayatana-indicator-application-service @@ -103,10 +103,10 @@ set(SOURCES set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) add_executable("ayatana-indicator-application-service" ${SOURCES}) -target_compile_definitions("ayatana-indicator-application-service" PUBLIC DATADIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/ayatana-indicator-application") +target_compile_definitions("ayatana-indicator-application-service" PUBLIC DATADIR="${CMAKE_INSTALL_FULL_DATADIR}/ayatana-indicator-application") target_compile_definitions("ayatana-indicator-application-service" PUBLIC G_LOG_DOMAIN="ayatana-indicator-application-service") target_include_directories("ayatana-indicator-application-service" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) target_include_directories("ayatana-indicator-application-service" PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries("ayatana-indicator-application-service" ${PROJECT_DEPS_LIBRARIES}) add_dependencies("ayatana-indicator-application-service" "ayatana-application") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application-service" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/ayatana-indicator-application") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application-service" DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ayatana-indicator-application") |