telepathy-qt: CMake: Fix Service CMake files installation

Alexandr Akulich kaffeine at kemper.freedesktop.org
Mon Nov 11 17:28:14 UTC 2019


Module: telepathy-qt
Branch: master
Commit: 1379b9adafaa5561abfa1928c315f4e8bd1cc01c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=1379b9adafaa5561abfa1928c315f4e8bd1cc01c

Author: Alexander Akulich <akulichalexander at gmail.com>
Date:   Fri Nov  8 21:46:07 2019 +0300

CMake: Fix Service CMake files installation

---

 TelepathyQt/CMakeLists.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt
index 4a0fe38c..18d07980 100644
--- a/TelepathyQt/CMakeLists.txt
+++ b/TelepathyQt/CMakeLists.txt
@@ -1014,11 +1014,7 @@ if(ENABLE_SERVICE_SUPPORT)
         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Service.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT pkgconfig)
     endif ()
 
-    if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-        set(_TelepathyQtServiceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR}Service)
-    else()
-        set(_TelepathyQtServiceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/TelepathyQt${QT_VERSION_MAJOR}Service/cmake)
-    endif()
+    set(_TelepathyQtServiceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR}Service)
 
     # Configure the actual Config file
     configure_package_config_file(TelepathyQtServiceConfig.cmake.in



More information about the telepathy-commits mailing list