drop support for QLibraryInfo::PrefixPath and QLibraryInfo::DataPath

prefix cannot be reliably set and data path is not actually required for
anything

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 978dacf..3ce9b00 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,20 +88,18 @@ set(KATIE_LICENSE "Open Source")
 set(KATIE_PRODUCT "AwesomeSauce")
 
 include(GNUInstallDirs)
-set(KATIE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}" CACHE PATH "General installation prefix")
 set(KATIE_HEADERS_PATH "${CMAKE_INSTALL_FULL_INCLUDEDIR}/katie" CACHE PATH "Headers installation path")
 set(KATIE_LIBRARIES_PATH "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Libraries installation path")
 set(KATIE_BINARIES_PATH "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Binaries installation path")
 set(KATIE_PLUGINS_PATH "${KATIE_LIBRARIES_PATH}/katie/plugins" CACHE PATH "Plugins installation path")
 set(KATIE_IMPORTS_PATH "${KATIE_LIBRARIES_PATH}/katie/imports" CACHE PATH "Declarative imports installation path")
-set(KATIE_DATA_PATH "${CMAKE_INSTALL_FULL_DATADIR}" CACHE PATH "Generic data installation path")
 set(KATIE_TRANSLATIONS_PATH "${CMAKE_INSTALL_FULL_LOCALEDIR}" CACHE PATH "Translations installation path")
 set(KATIE_CMAKE_PATH "${KATIE_LIBRARIES_PATH}/cmake/Katie" CACHE PATH "CMake aware modules installation path")
 set(KATIE_LDCONF_PATH "${CMAKE_INSTALL_FULL_SYSCONFDIR}/ld.so.conf.d" CACHE PATH "Run-time linker/loader configs installation path")
 set(KATIE_PROFILE_PATH "${CMAKE_INSTALL_FULL_SYSCONFDIR}/profile.d" CACHE PATH "Shell profile scripts installation path")
 set(KATIE_MAN_PATH "${CMAKE_INSTALL_FULL_MANDIR}" CACHE PATH "Manual pages installation path")
-set(KATIE_APPLICATIONS_PATH "${KATIE_DATA_PATH}/applications" CACHE PATH "Desktop applications register installation path")
-set(KATIE_PIXMAPS_PATH "${KATIE_DATA_PATH}/pixmaps" CACHE PATH "Desktop applications icon installation path")
+set(KATIE_APPLICATIONS_PATH "${CMAKE_INSTALL_FULL_DATADIR}/applications" CACHE PATH "Desktop applications register installation path")
+set(KATIE_PIXMAPS_PATH "${CMAKE_INSTALL_FULL_DATADIR}/pixmaps" CACHE PATH "Desktop applications icon installation path")
 set(KATIE_PKGCONFIG_PATH "${KATIE_LIBRARIES_PATH}/pkgconfig" CACHE PATH "pkg-config installation path")
 set(KATIE_TOOLS_SUFFIX "" CACHE STRING "Tools (moc, uic, rcc, etc.) suffix")
 

diff --git a/cmake/KatieConfig.cmake b/cmake/KatieConfig.cmake
index 5c6ef3f..2ab6057 100644 (file)
--- a/cmake/KatieConfig.cmake
+++ b/cmake/KatieConfig.cmake
@@ -26,13 +26,11 @@ if(NOT KATIE_FOUND)
     set(KATIE_FOUND TRUE)
 
     # Stored configuration paths that vendors usually change
-    set(KATIE_PREFIX_PATH "@KATIE_PREFIX_PATH@")
     set(KATIE_HEADERS_PATH "@KATIE_HEADERS_PATH@")
     set(KATIE_LIBRARIES_PATH "@KATIE_LIBRARIES_PATH@")
     set(KATIE_BINARIES_PATH "@KATIE_BINARIES_PATH@")
     set(KATIE_PLUGINS_PATH "@KATIE_PLUGINS_PATH@")
     set(KATIE_IMPORTS_PATH "@KATIE_IMPORTS_PATH@")
-    set(KATIE_DATA_PATH "@KATIE_DATA_PATH@")
     set(KATIE_TRANSLATIONS_PATH "@KATIE_TRANSLATIONS_PATH@")
     set(KATIE_LDCONF_PATH "@KATIE_LDCONF_PATH@")
     set(KATIE_PROFILE_PATH "@KATIE_PROFILE_PATH@")

diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake
index c8e5993..9dfc69d 100644 (file)
--- a/cmake/modules/KatieBuildMacros.cmake
+++ b/cmake/modules/KatieBuildMacros.cmake
@@ -138,9 +138,13 @@ macro(KATIE_GENERATE_PACKAGE FORTARGET REQUIRES)
         katie_string_wrap("${KATIE_DEFINITIONS}" KATIE_DEFINITIONS)
         set(PACKAGE_FLAGS "${PACKAGE_FLAGS} ${KATIE_DEFINITIONS}")
     endif()
+    set(PACKAGE_PREFIXDIR "${CMAKE_INSTALL_PREFIX}")
+    string(REPLACE "${PACKAGE_PREFIXDIR}" "\${prefix}" PACKAGE_INCLUDEDIR "${KATIE_HEADERS_PATH}")
+    string(REPLACE "${PACKAGE_PREFIXDIR}" "\${exec_prefix}" PACKAGE_LIBDIR "${KATIE_LIBRARIES_PATH}")
     configure_file(
         "${CMAKE_SOURCE_DIR}/cmake/pkgconfig.cmake"
         "${CMAKE_BINARY_DIR}/pkgconfig/${FORTARGET}.pc"
+        @ONLY
     )
     install(
         FILES "${CMAKE_BINARY_DIR}/pkgconfig/${FORTARGET}.pc"

diff --git a/cmake/pkgconfig.cmake b/cmake/pkgconfig.cmake
index b96e06c..93161a1 100644 (file)
--- a/cmake/pkgconfig.cmake
+++ b/cmake/pkgconfig.cmake
@@ -1,11 +1,11 @@
-prefix=${KATIE_PREFIX_PATH}
-exec_prefix=${KATIE_PREFIX_PATH}
-libdir=${KATIE_LIBRARIES_PATH}
-includedir=${KATIE_HEADERS_PATH}/${PACKAGE_FAKE}
+prefix=@PACKAGE_PREFIXDIR@
+exec_prefix=@PACKAGE_PREFIXDIR@
+libdir=@PACKAGE_LIBDIR@
+includedir=@PACKAGE_INCLUDEDIR@/@PACKAGE_FAKE@
 
-Name: ${PACKAGE_NAME}
-Description: ${PACKAGE_NAME} Library
-Version: ${KATIE_VERSION}
-Libs: -L${KATIE_LIBRARIES_PATH} -l${PACKAGE_NAME}
-Cflags: -I${KATIE_HEADERS_PATH} -I${KATIE_HEADERS_PATH}/${PACKAGE_FAKE} ${PACKAGE_FLAGS}
-Requires: ${PACKAGE_REQUIRES}
+Name: @PACKAGE_NAME@
+Description: @PACKAGE_NAME@ Library
+Version: @KATIE_VERSION@
+Libs: -L${libdir} -l@PACKAGE_NAME@
+Cflags: -I@PACKAGE_INCLUDEDIR@ -I${includedir} @PACKAGE_FLAGS@
+Requires: @PACKAGE_REQUIRES@

diff --git a/src/core/global/qconfig.cpp.cmake b/src/core/global/qconfig.cpp.cmake
index 806c5e4..f20c35c 100644 (file)
--- a/src/core/global/qconfig.cpp.cmake
+++ b/src/core/global/qconfig.cpp.cmake
@@ -38,11 +38,9 @@ static const char* qt_configure_licensee_str           = "${KATIE_LICENSE}\0";
 static const char* qt_configure_licensed_products_str  = "${KATIE_PRODUCT}\0";
 
 /* Runtime paths */
-static const char* qt_configure_prefix_path_str        = "${KATIE_PREFIX_PATH}\0";
 static const char* qt_configure_headers_path_str       = "${KATIE_HEADERS_PATH}\0";
 static const char* qt_configure_libraries_path_str     = "${KATIE_LIBRARIES_PATH}\0";
 static const char* qt_configure_binaries_path_str      = "${KATIE_BINARIES_PATH}\0";
 static const char* qt_configure_plugins_path_str       = "${KATIE_PLUGINS_PATH}\0";
 static const char* qt_configure_imports_path_str       = "${KATIE_IMPORTS_PATH}\0";
-static const char* qt_configure_data_path_str          = "${KATIE_DATA_PATH}\0";
 static const char* qt_configure_translations_path_str  = "${KATIE_TRANSLATIONS_PATH}\0";

diff --git a/src/core/global/qlibraryinfo.cpp b/src/core/global/qlibraryinfo.cpp
index 3cc95df..b00514b 100644 (file)
--- a/src/core/global/qlibraryinfo.cpp
+++ b/src/core/global/qlibraryinfo.cpp
@@ -73,13 +73,11 @@ QT_BEGIN_NAMESPACE
     This enum type is used to specify a specific location
     specifier:
 
-    \value PrefixPath The default prefix for all paths.
     \value HeadersPath The location for all headers.
     \value LibrariesPath The location of installed libraries.
     \value BinariesPath The location of installed Qt binaries (tools and applications).
     \value PluginsPath The location of installed Qt plugins.
     \value ImportsPath The location of installed QML extensions to import.
-    \value DataPath The location of general Qt data.
     \value TranslationsPath The location of translation information for Qt strings.
 
     \sa location()
@@ -140,8 +138,6 @@ QDate QLibraryInfo::buildDate()
 QString QLibraryInfo::location(LibraryLocation loc)
 {
     switch (loc) {
-        case PrefixPath:
-            return QString::fromLocal8Bit(qt_configure_prefix_path_str);
         case HeadersPath:
             return QString::fromLocal8Bit(qt_configure_headers_path_str);
         case LibrariesPath:
@@ -150,8 +146,6 @@ QString QLibraryInfo::location(LibraryLocation loc)
             return QString::fromLocal8Bit(qt_configure_binaries_path_str);
         case PluginsPath:
             return QString::fromLocal8Bit(qt_configure_plugins_path_str);
-        case DataPath:
-            return QString::fromLocal8Bit(qt_configure_data_path_str);
         case TranslationsPath:
             return QString::fromLocal8Bit(qt_configure_translations_path_str);
         case ImportsPath:

diff --git a/src/core/global/qlibraryinfo.h b/src/core/global/qlibraryinfo.h
index 02a43b1..6cf5db6 100644 (file)
--- a/src/core/global/qlibraryinfo.h
+++ b/src/core/global/qlibraryinfo.h
@@ -45,12 +45,10 @@ class Q_CORE_EXPORT QLibraryInfo
 {
 public:
     enum LibraryLocation {
-        PrefixPath,
         HeadersPath,
         LibrariesPath,
         BinariesPath,
         PluginsPath,
-        DataPath,
         TranslationsPath,
         ImportsPath
     };