summaryrefslogtreecommitdiff
authorUwe L. Korn <uwelk@xhochy.com>2014-02-26 18:40:43 (GMT)
committer David Edmundson <kde@davidedmundson.co.uk>2014-04-03 13:11:23 (GMT)
commit0191a6ddf0c094d9ae61b9ee48f1b282e13a9ef2 (patch) (side-by-side diff)
tree22f2fb4768f205696870cf5d567913d162111cf6
parentff169cde751d0bb0309109514dd10b9eff7de4e3 (diff)
downloadtelepathy-qt-master.zip
telepathy-qt-master.tar.gz
Add 5 to pkg-config package names for Qt5HEADmaster
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--CMakeLists.txt5
-rw-r--r--TelepathyQt/TelepathyQt-uninstalled.pc.in2
-rw-r--r--TelepathyQt/TelepathyQt.pc.in2
-rw-r--r--TelepathyQt/TelepathyQtService.pc.in2
4 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e72f559..d5e1b71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,6 +83,11 @@ set(QT5_MIN_VERSION "5.0.0")
set(QT5_MAX_VERSION "6.0.0")
find_package(Qt REQUIRED)
+IF(QT_VERSION_MAJOR MATCHES 5)
+ # It is QtCore for Qt4 but Qt5Core for Qt5 in pkg-config
+ SET(QT_VERSION_PC 5)
+ENDIF(QT_VERSION_MAJOR MATCHES 5)
+
foreach(flag ${QT_CONFIG_FLAGS})
if (${flag} MATCHES "reduce_relocations")
set(TP_QT_EXECUTABLE_LINKER_FLAGS "-fPIE")
diff --git a/TelepathyQt/TelepathyQt-uninstalled.pc.in b/TelepathyQt/TelepathyQt-uninstalled.pc.in
index e8bf5ce..a61c2d3 100644
--- a/TelepathyQt/TelepathyQt-uninstalled.pc.in
+++ b/TelepathyQt/TelepathyQt-uninstalled.pc.in
@@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR}
Name: TelepathyQt${QT_VERSION_MAJOR} (uninstalled copy)
Description: Qt utility library for the Telepathy framework
Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, QtNetwork >= ${QT_MIN_VERSION}, QtNetwork < ${QT_MAX_VERSION}, QtXml >= ${QT_MIN_VERSION}, QtXml < ${QT_MAX_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: ${CMAKE_BINARY_DIR}/TelepathyQt/libtelepathy-qt${QT_VERSION_MAJOR}.so
Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}
diff --git a/TelepathyQt/TelepathyQt.pc.in b/TelepathyQt/TelepathyQt.pc.in
index 92ba026..d245fed 100644
--- a/TelepathyQt/TelepathyQt.pc.in
+++ b/TelepathyQt/TelepathyQt.pc.in
@@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
Name: TelepathyQt${QT_VERSION_MAJOR}
Description: Qt utility library for the Telepathy framework
Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, QtNetwork >= ${QT_MIN_VERSION}, QtNetwork < ${QT_MAX_VERSION}, QtXml >= ${QT_MIN_VERSION}, QtXml < ${QT_MAX_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}
diff --git a/TelepathyQt/TelepathyQtService.pc.in b/TelepathyQt/TelepathyQtService.pc.in
index 69ba8c5..c579665 100644
--- a/TelepathyQt/TelepathyQtService.pc.in
+++ b/TelepathyQt/TelepathyQtService.pc.in
@@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
Name: TelepathyQt${QT_VERSION_MAJOR}Service
Description: Qt Telepathy Service side bindings
Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${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}