[kdelibs/frameworks] /: Only public dependencies should be found by config files.
Stephen Kelly
steveire at gmail.com
Wed Sep 25 21:27:12 UTC 2013
Git commit bdae65595d679fb982ae67ea3d47c34c4dcc97cb by Stephen Kelly.
Committed on 25/09/2013 at 21:25.
Pushed by skelly into branch 'frameworks'.
Only public dependencies should be found by config files.
Also, in target_link_libraries lines, only 'leaf' nodes should be
added.
CCMAIL: kde-frameworks-devel at kde.org
M +0 -1 dnssd/KDNSSDConfig.cmake.in
M +0 -6 kdewebkit/KDEWebKitConfig.cmake.in
M +1 -1 kdewebkit/src/CMakeLists.txt
M +0 -1 kparts/KPartsConfig.cmake.in
http://commits.kde.org/kdelibs/bdae65595d679fb982ae67ea3d47c34c4dcc97cb
diff --git a/dnssd/KDNSSDConfig.cmake.in b/dnssd/KDNSSDConfig.cmake.in
index a292852..f32cccc 100644
--- a/dnssd/KDNSSDConfig.cmake.in
+++ b/dnssd/KDNSSDConfig.cmake.in
@@ -1,7 +1,6 @@
@PACKAGE_INIT@
find_dependency(Qt5Network @REQUIRED_QT_VERSION@)
-find_dependency(Qt5DBus @REQUIRED_QT_VERSION@)
set(KDNSSD_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
set_and_check(KDNSSD_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
diff --git a/kdewebkit/KDEWebKitConfig.cmake.in b/kdewebkit/KDEWebKitConfig.cmake.in
index 2e12896..1241cc8 100644
--- a/kdewebkit/KDEWebKitConfig.cmake.in
+++ b/kdewebkit/KDEWebKitConfig.cmake.in
@@ -1,12 +1,6 @@
@PACKAGE_INIT@
-find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
-find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
find_dependency(Qt5WebkitWidgets @REQUIRED_QT_VERSION@)
-find_dependency(KCoreAddons "${PACKAGE_VERSION}")
-find_dependency(KWallet "${PACKAGE_VERSION}")
-find_dependency(KIOWidgets "${PACKAGE_VERSION}")
-find_dependency(KParts "${PACKAGE_VERSION}")
set(KDEWebkit_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
set_and_check(KDEWebkit_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
diff --git a/kdewebkit/src/CMakeLists.txt b/kdewebkit/src/CMakeLists.txt
index 3e04b19..ba83d57 100644
--- a/kdewebkit/src/CMakeLists.txt
+++ b/kdewebkit/src/CMakeLists.txt
@@ -9,7 +9,7 @@ set(KDEWebKit_LIB_SRCS
add_library(KDEWebKit ${KDEWebKit_LIB_SRCS})
generate_export_header(KDEWebKit)
-target_link_libraries(KDEWebKit LINK_PUBLIC Qt5::Core Qt5::Gui Qt5::WebKitWidgets
+target_link_libraries(KDEWebKit LINK_PUBLIC Qt5::WebKitWidgets
LINK_PRIVATE KCoreAddons KWallet KIOWidgets KParts)
set_target_properties(KDEWebKit PROPERTIES VERSION ${KDEWEBKIT_VERSION_STRING}
diff --git a/kparts/KPartsConfig.cmake.in b/kparts/KPartsConfig.cmake.in
index 23f5129..7da9f5b 100644
--- a/kparts/KPartsConfig.cmake.in
+++ b/kparts/KPartsConfig.cmake.in
@@ -1,6 +1,5 @@
@PACKAGE_INIT@
-find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
find_dependency(XmlGui "${PACKAGE_VERSION}")
find_dependency(KIOCore "${PACKAGE_VERSION}")
find_dependency(KTextWidgets "${PACKAGE_VERSION}")
More information about the Kde-frameworks-devel
mailing list