Hello Aleix Pol Gonzalez, David Faure,
I'd like you to do a code review. Please visit
https://gerrit.vesnicky.cesnet.cz/r/432
to review the following change.
Change subject: Consolidate find_package calls
......................................................................
Consolidate find_package calls
Remove all duplicated find_package calls from 2nd and below level
CMakeLists. One exception is KF5XmlGui, which needs to be found for
autotests; previously it was found through KF5Bookmarks' find_dependency call.
This will fix build against KF5 master with BUILD_TESTING=ON (=default).
Change-Id: I9025505d57fe82438dea8c0270f962bf9fed36cf
---
M CMakeLists.txt
M autotests/CMakeLists.txt
M autotests/http/CMakeLists.txt
M src/filewidgets/CMakeLists.txt
M src/ioslaves/help/CMakeLists.txt
M src/ioslaves/http/CMakeLists.txt
6 files changed, 1 insertion(+), 17 deletions(-)
git pull ssh://gerrit.vesnicky.cesnet.cz:29418/kio refs/changes/32/432/1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1cd0e1..577f8c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,7 @@
find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5JobWidgets ${KF5_DEP_VERSION} REQUIRED)
+find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
endif()
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 69c8957..1bbcb35 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -8,11 +8,7 @@
add_subdirectory(http)
add_subdirectory(kcookiejar)
-find_package(Qt5Widgets REQUIRED)
-
########### unittests ###############
-
-find_package(Qt5Concurrent 5.2.0 REQUIRED NO_MODULE)
ecm_add_tests(
kacltest.cpp
diff --git a/autotests/http/CMakeLists.txt b/autotests/http/CMakeLists.txt
index 069d7ae..a55c2cc 100644
--- a/autotests/http/CMakeLists.txt
+++ b/autotests/http/CMakeLists.txt
@@ -1,7 +1,3 @@
-find_package(Qt5Test REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
-
find_package(ZLIB)
set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip
compressed files and data streams"
URL "http://www.zlib.net";
diff --git a/src/filewidgets/CMakeLists.txt b/src/filewidgets/CMakeLists.txt
index 37c3f26..903baad 100644
--- a/src/filewidgets/CMakeLists.txt
+++ b/src/filewidgets/CMakeLists.txt
@@ -1,8 +1,5 @@
project(KIOFileWidgets)
-find_package(KF5Bookmarks ${KF5_DEP_VERSION} REQUIRED)
-find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED)
-
configure_file(config-kiofilewidgets.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-kiofilewidgets.h)
set(kiofilewidgets_SRCS
diff --git a/src/ioslaves/help/CMakeLists.txt b/src/ioslaves/help/CMakeLists.txt
index 8b7b21e..1895669 100644
--- a/src/ioslaves/help/CMakeLists.txt
+++ b/src/ioslaves/help/CMakeLists.txt
@@ -2,7 +2,6 @@
remove_definitions(-DQT_NO_CAST_FROM_ASCII)
-find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
find_package(LibXslt)
set_package_properties(LibXslt PROPERTIES
URL "http://xmlsoft.org/XSLT";
@@ -27,8 +26,6 @@
configure_file(config-help.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-help.h )
#macro_additional_clean_files( ${CMAKE_CURRENT_BINARY_DIR}/checkXML )
-
-find_package(Qt5Core 5.2.0 REQUIRED NO_MODULE)
########### next target ###############
diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt
index 76a8e28..0066bd1 100644
--- a/src/ioslaves/http/CMakeLists.txt
+++ b/src/ioslaves/http/CMakeLists.txt
@@ -3,9 +3,6 @@
include(ConfigureChecks.cmake)
configure_file(config-kioslave-http.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-http.h )
-find_package(X11)
-set(HAVE_X11 ${X11_FOUND})
-
if(GSSAPI_FOUND)
set(HAVE_LIBGSSAPI 1)
if(GSSAPI_FLAVOR STREQUAL "MIT")
--
To view, visit https://gerrit.vesnicky.cesnet.cz/r/432
To unsubscribe, visit https://gerrit.vesnicky.cesnet.cz/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9025505d57fe82438dea8c0270f962bf9fed36cf
Gerrit-PatchSet: 1
Gerrit-Project: kio
Gerrit-Branch: master
Gerrit-Owner: Hrvoje Senjan <hrvoje.sen...@gmail.com>
Gerrit-Reviewer: Aleix Pol Gonzalez <aleix...@kde.org>
Gerrit-Reviewer: David Faure <fa...@kde.org>
Gerrit-Reviewer: Michael Palimaka <kensing...@gentoo.org>
Gerrit-Reviewer: Patrick Spendrin <ps...@gmx.de>
Gerrit-Reviewer: Sysadmin Testing Account <n...@kde.org>
_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
