telepathy-qt: CMake: Port to GNUInstallDirs

[Alexandr Akulich]

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

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

CMake: Port to GNUInstallDirs

LIB_INSTALL_DIR and INCLUDE_INSTALL_DIR are now always absolute paths.

---

 TelepathyQt/TelepathyQt.pc.in         | 10 ++++------
 TelepathyQt/TelepathyQtService.pc.in  | 10 ++++------
 cmake/modules/TelepathyDefaults.cmake | 26 +++++++++++++++++++++++---
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/TelepathyQt/TelepathyQt.pc.in b/TelepathyQt/TelepathyQt.pc.in
index d245fed9..5062e4e9 100644
--- a/TelepathyQt/TelepathyQt.pc.in
+++ b/TelepathyQt/TelepathyQt.pc.in
@@ -1,11 +1,9 @@
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}
-includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
+libdir=${LIB_INSTALL_DIR}
+includedir=${INCLUDE_INSTALL_DIR}
 
 Name: TelepathyQt${QT_VERSION_MAJOR}
 Description: Qt utility library for the Telepathy framework
 Version: ${PACKAGE_VERSION}
 Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}Network >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Network < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}Xml >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Xml < ${QT_MAX_VERSION}
-Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}
-Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
+Libs: -L${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}
+Cflags: -I${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
diff --git a/TelepathyQt/TelepathyQtService.pc.in b/TelepathyQt/TelepathyQtService.pc.in
index c5796654..d3485dc6 100644
--- a/TelepathyQt/TelepathyQtService.pc.in
+++ b/TelepathyQt/TelepathyQtService.pc.in
@@ -1,11 +1,9 @@
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}
-includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
+libdir=${LIB_INSTALL_DIR}
+includedir=${INCLUDE_INSTALL_DIR}
 
 Name: TelepathyQt${QT_VERSION_MAJOR}Service
 Description: Qt Telepathy Service side bindings
 Version: ${PACKAGE_VERSION}
 Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
-Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-service
-Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
+Libs: -L${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-service
+Cflags: -I${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
index faaaa39c..29aac969 100644
--- a/cmake/modules/TelepathyDefaults.cmake
+++ b/cmake/modules/TelepathyDefaults.cmake
@@ -147,6 +147,26 @@ if(MSVC)
     set(ESCAPE_CHAR ^)
 endif()
 
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
-set(LIB_INSTALL_DIR     "lib${LIB_SUFFIX}"  CACHE PATH "The subdirectory where libraries will be installed (default is ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})" FORCE)
-set(INCLUDE_INSTALL_DIR "include"           CACHE PATH "The subdirectory where header files will be installed (default is ${CMAKE_INSTALL_PREFIX}/include)" FORCE)
+include(GNUInstallDirs)
+
+if((DEFINED LIB_SUFFIX) AND (NOT DEFINED LIB_INSTALL_DIR))
+    set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
+endif()
+
+if(DEFINED LIB_INSTALL_DIR)
+    message(STATUS "Warning! LIB_SUFFIX and LIB_INSTALL_DIR options are deprecated. Use GNUInstallDirs options instead.")
+    if(NOT IS_ABSOLUTE "${LIB_INSTALL_DIR}")
+        set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
+    endif()
+else()
+    set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+endif()
+
+if(DEFINED INCLUDE_INSTALL_DIR)
+    message(STATUS "Warning! INCLUDE_INSTALL_DIR option is deprecated. Use GNUInstallDirs options instead.")
+    if(NOT IS_ABSOLUTE "${INCLUDE_INSTALL_DIR}")
+        set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}")
+    endif()
+else()
+    set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+endif()