diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-09 08:41:41 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-09 08:41:41 +0200 |
| commit | db18ded6c8a4ab9d4a0921a3f52e8f3507607238 (patch) | |
| tree | b1bbaf330dfb7c0775b74e104bc0642c3d48912b /src | |
| parent | d4d621c95a4d849393c74e1b5d256cc14b78be60 (diff) | |
| parent | 84322ea92346f56b1e1a882f9f66e250289a115c (diff) | |
| download | libayatana-common-db18ded6c8a4ab9d4a0921a3f52e8f3507607238.tar.gz libayatana-common-db18ded6c8a4ab9d4a0921a3f52e8f3507607238.tar.bz2 libayatana-common-db18ded6c8a4ab9d4a0921a3f52e8f3507607238.zip | |
Merge branch 'tari01-pr/cmake-install-full'
Attributes GH PR #23: https://github.com/AyatanaIndicators/libayatana-common/pull/23
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/libayatana-common.pc.in | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4834a19..0189cc1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,6 +24,6 @@ set_target_properties(ayatana-common configure_file(libayatana-common.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libayatana-common.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libayatana-common.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ayatana/common) -install(TARGETS ayatana-common DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libayatana-common.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig) +install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/ayatana/common) +install(TARGETS ayatana-common DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) diff --git a/src/libayatana-common.pc.in b/src/libayatana-common.pc.in index 2a1ac48..df79e1f 100644 --- a/src/libayatana-common.pc.in +++ b/src/libayatana-common.pc.in @@ -1,10 +1,10 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include/ayatana +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/ayatana Name: Ayatana common Description: Ayatana common library Version: @PROJECT_VERSION@ Libs: -L${libdir} -layatana-common -Cflags: -I${includedir} +Cflags: -I${includedir} |