telepathy-qt: Remove DATA_INSTALL_DIR

[Alexandr Akulich]

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

Author: Niels Ole Salscheider <niels_ole at salscheider-online.de>
Date:   Mon Oct  3 12:52:28 2016 +0200

Remove DATA_INSTALL_DIR

We do not install anything in that directory. But having it causes an error
for any user of telepathy-qt when the directory does not exist.

---

 TelepathyQt/CMakeLists.txt                                | 4 ++--
 TelepathyQt/Farstream/CMakeLists.txt                      | 2 +-
 TelepathyQt/Farstream/TelepathyQtFarstreamConfig.cmake.in | 1 -
 TelepathyQt/TelepathyQtConfig.cmake.in                    | 1 -
 TelepathyQt/TelepathyQtServiceConfig.cmake.in             | 1 -
 cmake/modules/TelepathyDefaults.cmake                     | 1 -
 6 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt
index eae0554..a49cfdf 100644
--- a/TelepathyQt/CMakeLists.txt
+++ b/TelepathyQt/CMakeLists.txt
@@ -828,7 +828,7 @@ include(CMakePackageConfigHelpers)
 configure_package_config_file(TelepathyQtConfig.cmake.in
     "${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Config.cmake"
     INSTALL_DESTINATION ${_TelepathyQtConfig_INSTALL_DIR}
-    PATH_VARS CMAKE_INSTALL_PREFIX INCLUDE_INSTALL_DIR LIB_INSTALL_DIR DATA_INSTALL_DIR
+    PATH_VARS CMAKE_INSTALL_PREFIX INCLUDE_INSTALL_DIR LIB_INSTALL_DIR
     NO_CHECK_REQUIRED_COMPONENTS_MACRO)
 
 # this file is used by to check if the installed version can be used.
@@ -1019,7 +1019,7 @@ if(ENABLE_SERVICE_SUPPORT)
     configure_package_config_file(TelepathyQtServiceConfig.cmake.in
         "${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}ServiceConfig.cmake"
         INSTALL_DESTINATION ${_TelepathyQtServiceConfig_INSTALL_DIR}
-        PATH_VARS CMAKE_INSTALL_PREFIX INCLUDE_INSTALL_DIR LIB_INSTALL_DIR DATA_INSTALL_DIR
+        PATH_VARS CMAKE_INSTALL_PREFIX INCLUDE_INSTALL_DIR LIB_INSTALL_DIR
         NO_CHECK_REQUIRED_COMPONENTS_MACRO)
 
     # this file is used by to check if the installed version can be used.
diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt
index 3fa7207..a5135fa 100644
--- a/TelepathyQt/Farstream/CMakeLists.txt
+++ b/TelepathyQt/Farstream/CMakeLists.txt
@@ -89,7 +89,7 @@ if(FARSTREAM_COMPONENTS_FOUND)
     configure_package_config_file(TelepathyQtFarstreamConfig.cmake.in
         "${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarstreamConfig.cmake"
         INSTALL_DESTINATION ${_TelepathyQtFarstreamConfig_INSTALL_DIR}
-        PATH_VARS CMAKE_INSTALL_PREFIX INCLUDE_INSTALL_DIR LIB_INSTALL_DIR DATA_INSTALL_DIR
+        PATH_VARS CMAKE_INSTALL_PREFIX INCLUDE_INSTALL_DIR LIB_INSTALL_DIR
         NO_CHECK_REQUIRED_COMPONENTS_MACRO)
 
     # this file is used by to check if the installed version can be used.
diff --git a/TelepathyQt/Farstream/TelepathyQtFarstreamConfig.cmake.in b/TelepathyQt/Farstream/TelepathyQtFarstreamConfig.cmake.in
index 986247c..47cca62 100644
--- a/TelepathyQt/Farstream/TelepathyQtFarstreamConfig.cmake.in
+++ b/TelepathyQt/Farstream/TelepathyQtFarstreamConfig.cmake.in
@@ -19,7 +19,6 @@ if(NOT TelepathyQt at QT_VERSION_MAJOR@Farstream_FOUND)
 
     set_and_check(TELEPATHY_QT at QT_VERSION_MAJOR@_FARSTREAM_INCLUDE_DIR    "@PACKAGE_INCLUDE_INSTALL_DIR@/telepathy-qt at QT_VERSION_MAJOR@")
     set_and_check(TELEPATHY_QT at QT_VERSION_MAJOR@_FARSTREAM_LIB_DIR        "@PACKAGE_LIB_INSTALL_DIR@")
-    set_and_check(TELEPATHY_QT at QT_VERSION_MAJOR@_FARSTREAM_SHARE_DIR      "@PACKAGE_DATA_INSTALL_DIR@")
 
     find_package(TelepathyQt at QT_VERSION_MAJOR@ REQUIRED)
 
diff --git a/TelepathyQt/TelepathyQtConfig.cmake.in b/TelepathyQt/TelepathyQtConfig.cmake.in
index 7ceccb7..b4b02b0 100644
--- a/TelepathyQt/TelepathyQtConfig.cmake.in
+++ b/TelepathyQt/TelepathyQtConfig.cmake.in
@@ -19,7 +19,6 @@ if(NOT TelepathyQt at QT_VERSION_MAJOR@_FOUND)
 
     set_and_check(TELEPATHY_QT at QT_VERSION_MAJOR@_INCLUDE_DIR   "@PACKAGE_INCLUDE_INSTALL_DIR@/telepathy-qt at QT_VERSION_MAJOR@")
     set_and_check(TELEPATHY_QT at QT_VERSION_MAJOR@_LIB_DIR       "@PACKAGE_LIB_INSTALL_DIR@")
-    set_and_check(TELEPATHY_QT at QT_VERSION_MAJOR@_SHARE_DIR     "@PACKAGE_DATA_INSTALL_DIR@")
 
     # attempt to find the generated TelepathyQt4Targets.cmake in the same directory
     get_filename_component(_TPQT at QT_VERSION_MAJOR@_CONFIG_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
diff --git a/TelepathyQt/TelepathyQtServiceConfig.cmake.in b/TelepathyQt/TelepathyQtServiceConfig.cmake.in
index b128e41..eec1aed 100644
--- a/TelepathyQt/TelepathyQtServiceConfig.cmake.in
+++ b/TelepathyQt/TelepathyQtServiceConfig.cmake.in
@@ -17,7 +17,6 @@ endif()
 
 set_and_check(TELEPATHY_QT at QT_VERSION_MAJOR@_SERVICE_INCLUDE_DIR  "@PACKAGE_INCLUDE_INSTALL_DIR@/telepathy-qt at QT_VERSION_MAJOR@")
 set_and_check(TELEPATHY_QT at QT_VERSION_MAJOR@_SERVICE_LIB_DIR      "@PACKAGE_LIB_INSTALL_DIR@")
-set_and_check(TELEPATHY_QT at QT_VERSION_MAJOR@_SERVICE_SHARE_DIR    "@PACKAGE_DATA_INSTALL_DIR@")
 
 find_package(TelepathyQt at QT_VERSION_MAJOR@ REQUIRED)
 
diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
index 443c365..0bc1340 100644
--- a/cmake/modules/TelepathyDefaults.cmake
+++ b/cmake/modules/TelepathyDefaults.cmake
@@ -155,4 +155,3 @@ 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)
-set(DATA_INSTALL_DIR    "share/telepathy"   CACHE PATH "The subdirectory where data files will be installed (default is ${CMAKE_INSTALL_PREFIX}/share/telepathy)" FORCE)