diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-02-16 11:27:40 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-02-16 11:27:40 +0100 |
commit | a0cb25c95f83ce1f021dc92947ce19ef764aa7a5 (patch) | |
tree | 3552ea2da1ce7ff9c2adde50fa40feeffb3284ef | |
parent | abbda6214d6030de108f30f7b9e9acc91c67954f (diff) | |
parent | 6af097364f37b749533b766affbdaee27b6e757d (diff) | |
download | libayatana-common-a0cb25c95f83ce1f021dc92947ce19ef764aa7a5.tar.gz libayatana-common-a0cb25c95f83ce1f021dc92947ce19ef764aa7a5.tar.bz2 libayatana-common-a0cb25c95f83ce1f021dc92947ce19ef764aa7a5.zip |
Merge branch 'tari01-pr/drop-cmake-install-full-pkglibexecdir'
Attributes GH PR #58: https://github.com/AyatanaIndicators/libayatana-common/pull/58
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 51db47f..73bc55b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ # vim: set ts=2 sts=2 sw=2 expandtab : -dist: bionic +dist: focal language: shell os: linux arch: - amd64 - - ppc64le +# - ppc64le services: - docker diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fdda11..ad433a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,8 +38,6 @@ endif() # GNU standard installation directories include (GNUInstallDirs) -set (CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") -set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") # Check for prerequisites find_package (PkgConfig REQUIRED) |