diff options
| author | Robert Tari <robert@tari.in> | 2021-10-19 18:43:36 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-10-19 18:43:36 +0200 |
| commit | 79db730f51895b5a756a468ccdeab5f34fc1abcf (patch) | |
| tree | 19f6d536f970e2f332478914d560dcd33cf95ffb | |
| parent | 7a377a1ca42b83d692a11af36934eddbc0661f69 (diff) | |
| parent | eecd9dd882516b59f1b5e08bca9e6928b1fa2054 (diff) | |
| download | libayatana-indicator-79db730f51895b5a756a468ccdeab5f34fc1abcf.tar.gz libayatana-indicator-79db730f51895b5a756a468ccdeab5f34fc1abcf.tar.bz2 libayatana-indicator-79db730f51895b5a756a468ccdeab5f34fc1abcf.zip | |
Merge branch 'sunweaver-pr/different-folders-for-include-files-based-on-GTK-flavour'
Attributes GH PR #56: https://github.com/AyatanaIndicators/libayatana-indicator/pull/56
| -rw-r--r-- | debian/libayatana-indicator-dev.install | 2 | ||||
| -rw-r--r-- | debian/libayatana-indicator3-dev.install | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 30 |
3 files changed, 17 insertions, 17 deletions
diff --git a/debian/libayatana-indicator-dev.install b/debian/libayatana-indicator-dev.install index 8d167db..e4d125f 100644 --- a/debian/libayatana-indicator-dev.install +++ b/debian/libayatana-indicator-dev.install @@ -1,3 +1,3 @@ -usr/include +usr/include/libayatana-indicator-0.4/ usr/lib/*/pkgconfig/ayatana-indicator-0.4.pc usr/lib/*/libayatana-indicator.so diff --git a/debian/libayatana-indicator3-dev.install b/debian/libayatana-indicator3-dev.install index 73dc715..1998935 100644 --- a/debian/libayatana-indicator3-dev.install +++ b/debian/libayatana-indicator3-dev.install @@ -1,3 +1,3 @@ -usr/include +usr/include/libayatana-indicator3-0.4/ usr/lib/*/pkgconfig/ayatana-indicator3-0.4.pc usr/lib/*/libayatana-indicator3.so diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9a63eb8..9d3fb22 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,13 +6,21 @@ # indicator-service.h # indicator.h -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-desktop-shortcuts.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-image-helper.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-ng.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-object.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service-manager.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") +if (FLAVOUR_GTK3) + # libayatana-indicator3.so + set (ayatana_indicator_gtkver "ayatana-indicator3") +else() + # libayatana-indicator.so + set (ayatana_indicator_gtkver "ayatana-indicator") +endif() + +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-desktop-shortcuts.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-image-helper.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-ng.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-object.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service-manager.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") set(HEADERS indicator.h @@ -123,14 +131,6 @@ string(APPEND GEN_INDICATOR_SERVICE_XML_C "\;") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/gen-indicator-service.xml.c" ${GEN_INDICATOR_SERVICE_XML_C}) -if (FLAVOUR_GTK3) - # libayatana-indicator3.so - set (ayatana_indicator_gtkver "ayatana-indicator3") -else() - # libayatana-indicator.so - set (ayatana_indicator_gtkver "ayatana-indicator") -endif() - # libayatana-indicator{,3}.so set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) |