telepathy-qt: CMake: Remove USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR option

[Alexandr Akulich]

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

Author: Alexander Akulich <akulichalexander at gmail.com>
Date:   Thu Nov  7 02:17:54 2019 +0300

CMake: Remove USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR option

---

 TelepathyQt/CMakeLists.txt            | 6 +-----
 TelepathyQt/Farstream/CMakeLists.txt  | 6 +-----
 cmake/modules/TelepathyDefaults.cmake | 5 -----
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt
index a49cfdf1..3ac20d87 100644
--- a/TelepathyQt/CMakeLists.txt
+++ b/TelepathyQt/CMakeLists.txt
@@ -815,11 +815,7 @@ if (NOT WIN32)
 endif ()
 
 # Find out the correct installation directory
-if (USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-    set(_TelepathyQtConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR})
-else ()
-    set(_TelepathyQtConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/TelepathyQt${QT_VERSION_MAJOR}/cmake)
-endif ()
+set(_TelepathyQtConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR})
 
 # CMake Version and config files
 include(CMakePackageConfigHelpers)
diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt
index a5135fa0..6ddc9c6a 100644
--- a/TelepathyQt/Farstream/CMakeLists.txt
+++ b/TelepathyQt/Farstream/CMakeLists.txt
@@ -79,11 +79,7 @@ if(FARSTREAM_COMPONENTS_FOUND)
                 DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT pkgconfig)
     endif ()
 
-    if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-        set(_TelepathyQtFarstreamConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR}Farstream)
-    else()
-        set(_TelepathyQtFarstreamConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farstream/cmake)
-    endif()
+    set(_TelepathyQtFarstreamConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR}Farstream)
 
     # Configure the actual Config file
     configure_package_config_file(TelepathyQtFarstreamConfig.cmake.in
diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
index 0bc1340d..faaaa39c 100644
--- a/cmake/modules/TelepathyDefaults.cmake
+++ b/cmake/modules/TelepathyDefaults.cmake
@@ -13,11 +13,6 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 # Use colored output
 set(CMAKE_COLOR_MAKEFILE ON)
 
-# Add an option to decide where to install the config files
-if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
-    option(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR "Prefer to install the <package>Config.cmake files to lib/cmake/<package> instead of lib/<package>/cmake" TRUE)
-endif ()
-
 # Set compiler flags
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -ggdb")