diff --git a/addons/CMakeLists.txt b/addons/CMakeLists.txt --- a/addons/CMakeLists.txt +++ b/addons/CMakeLists.txt @@ -1,5 +1,5 @@ # Most plugins will need to link against KF5TextEditor to have access to its plugin interface. -find_package(KF5TextEditor QUIET REQUIRED) +find_package(KF5TextEditor ${KF5_DEP_VERSION} QUIET REQUIRED) ecm_optional_add_subdirectory(backtracebrowser) ecm_optional_add_subdirectory(close-except-like) # Close all documents except this one (or similar). diff --git a/addons/backtracebrowser/autotests/CMakeLists.txt b/addons/backtracebrowser/autotests/CMakeLists.txt --- a/addons/backtracebrowser/autotests/CMakeLists.txt +++ b/addons/backtracebrowser/autotests/CMakeLists.txt @@ -3,7 +3,7 @@ add_executable(btbrowser_test "") target_include_directories(btbrowser_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) -find_package(Qt5Test QUIET REQUIRED) +find_package(Qt5Test ${QT_MIN_VERSION} QUIET REQUIRED) target_link_libraries( btbrowser_test PRIVATE diff --git a/addons/close-except-like/CMakeLists.txt b/addons/close-except-like/CMakeLists.txt --- a/addons/close-except-like/CMakeLists.txt +++ b/addons/close-except-like/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(KF5IconThemes QUIET) +find_package(KF5IconThemes ${KF5_DEP_VERSION} QUIET) set_package_properties(KF5IconThemes PROPERTIES PURPOSE "Required to build the close-except-like addon") if(NOT KF5IconThemes_FOUND) diff --git a/addons/externaltools/CMakeLists.txt b/addons/externaltools/CMakeLists.txt --- a/addons/externaltools/CMakeLists.txt +++ b/addons/externaltools/CMakeLists.txt @@ -2,17 +2,17 @@ return() endif() -find_package(KF5I18n QUIET) +find_package(KF5I18n ${KF5_DEP_VERSION} QUIET) if(NOT KF5I18n_FOUND) return() endif() -find_package(KF5IconThemes QUIET) +find_package(KF5IconThemes ${KF5_DEP_VERSION} QUIET) if(NOT KF5IconThemes_FOUND) return() endif() -find_package(Qt5Test QUIET REQUIRED) +find_package(Qt5Test ${QT_MIN_VERSION} QUIET REQUIRED) add_library(externaltoolsplugin MODULE "") target_compile_definitions(externaltoolsplugin PRIVATE TRANSLATION_DOMAIN="kateexternaltoolsplugin") diff --git a/addons/externaltools/autotests/CMakeLists.txt b/addons/externaltools/autotests/CMakeLists.txt --- a/addons/externaltools/autotests/CMakeLists.txt +++ b/addons/externaltools/autotests/CMakeLists.txt @@ -1,11 +1,11 @@ include(ECMMarkAsTest) -find_package(KF5Config QUIET) # KConfig, KConfigGroup +find_package(KF5Config ${KF5_DEP_VERSION} QUIET) # KConfig, KConfigGroup if(NOT KF5Config_FOUND) return() endif() -find_package(KF5CoreAddons QUIET) # KShell +find_package(KF5CoreAddons ${KF5_DEP_VERSION} QUIET) # KShell if(NOT KF5CoreAddons_FOUND) return() endif() diff --git a/addons/filebrowser/CMakeLists.txt b/addons/filebrowser/CMakeLists.txt --- a/addons/filebrowser/CMakeLists.txt +++ b/addons/filebrowser/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(KF5KIO QUIET) +find_package(KF5KIO ${KF5_DEP_VERSION} QUIET) set_package_properties(KF5KIO PROPERTIES PURPOSE "Required to build the filebrowser addon") if(NOT KF5KIO_FOUND) diff --git a/addons/filetree/CMakeLists.txt b/addons/filetree/CMakeLists.txt --- a/addons/filetree/CMakeLists.txt +++ b/addons/filetree/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(KF5GuiAddons QUIET) +find_package(KF5GuiAddons ${KF5_DEP_VERSION} QUIET) set_package_properties(KF5GuiAddons PROPERTIES PURPOSE "Required to build the katefiletree addon") if(NOT KF5GuiAddons_FOUND) diff --git a/addons/filetree/autotests/CMakeLists.txt b/addons/filetree/autotests/CMakeLists.txt --- a/addons/filetree/autotests/CMakeLists.txt +++ b/addons/filetree/autotests/CMakeLists.txt @@ -3,7 +3,7 @@ add_executable(filetree_model_test "") target_include_directories(filetree_model_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) -find_package(Qt5Test QUIET REQUIRED) +find_package(Qt5Test ${QT_MIN_VERSION} QUIET REQUIRED) target_link_libraries( filetree_model_test PRIVATE diff --git a/addons/katesql/CMakeLists.txt b/addons/katesql/CMakeLists.txt --- a/addons/katesql/CMakeLists.txt +++ b/addons/katesql/CMakeLists.txt @@ -1,7 +1,7 @@ -find_package(KF5Wallet QUIET) +find_package(KF5Wallet ${KF5_DEP_VERSION} QUIET) set_package_properties(KF5Wallet PROPERTIES PURPOSE "Required to build the katesql addon") -find_package(Qt5Sql QUIET) +find_package(Qt5Sql ${QT_MIN_VERSION} QUIET) set_package_properties(Qt5Sql PROPERTIES PURPOSE "Required to build the katesql addon") if(NOT KF5Wallet_FOUND OR NOT Qt5Sql_FOUND) diff --git a/addons/lspclient/CMakeLists.txt b/addons/lspclient/CMakeLists.txt --- a/addons/lspclient/CMakeLists.txt +++ b/addons/lspclient/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(KF5ItemModels QUIET) +find_package(KF5ItemModels ${KF5_DEP_VERSION} QUIET) set_package_properties(KF5ItemModels PROPERTIES PURPOSE "Required to build the lspclient addon") if(NOT KF5ItemModels_FOUND) diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt --- a/addons/project/CMakeLists.txt +++ b/addons/project/CMakeLists.txt @@ -1,5 +1,5 @@ find_package( - KF5 + KF5 ${KF5_DEP_VERSION} QUIET COMPONENTS GuiAddons diff --git a/addons/project/autotests/CMakeLists.txt b/addons/project/autotests/CMakeLists.txt --- a/addons/project/autotests/CMakeLists.txt +++ b/addons/project/autotests/CMakeLists.txt @@ -3,7 +3,7 @@ add_executable(projectplugin_test "") target_include_directories(projectplugin_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) -find_package(Qt5Test QUIET REQUIRED) +find_package(Qt5Test ${QT_MIN_VERSION} QUIET REQUIRED) target_link_libraries( projectplugin_test PRIVATE diff --git a/addons/replicode/CMakeLists.txt b/addons/replicode/CMakeLists.txt --- a/addons/replicode/CMakeLists.txt +++ b/addons/replicode/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(KF5IconThemes QUIET) +find_package(KF5IconThemes ${KF5_DEP_VERSION} QUIET) set_package_properties(KF5IconThemes PROPERTIES PURPOSE "Required to build the replicode addon") if(NOT KF5IconThemes_FOUND) diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt --- a/addons/search/CMakeLists.txt +++ b/addons/search/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(KF5ItemViews QUIET) +find_package(KF5ItemViews ${KF5_DEP_VERSION} QUIET) set_package_properties(KF5ItemViews PROPERTIES PURPOSE "Required to build the search addon") if(NOT KF5ItemViews_FOUND) diff --git a/addons/sessionapplet/CMakeLists.txt b/addons/sessionapplet/CMakeLists.txt --- a/addons/sessionapplet/CMakeLists.txt +++ b/addons/sessionapplet/CMakeLists.txt @@ -1,7 +1,7 @@ -find_package(KF5Plasma QUIET) +find_package(KF5Plasma ${KF5_DEP_VERSION} QUIET) set_package_properties(KF5Plasma PROPERTIES PURPOSE "Required to build the sessionapplet addon") -find_package(Qt5Widgets QUIET) +find_package(Qt5Widgets ${QT_MIN_VERSION} QUIET) set_package_properties(Qt5Widgets PROPERTIES PURPOSE "Required to build the sessionapplet addon") if(NOT KF5Plasma_FOUND OR NOT Qt5Widgets_FOUND) diff --git a/addons/snippets/CMakeLists.txt b/addons/snippets/CMakeLists.txt --- a/addons/snippets/CMakeLists.txt +++ b/addons/snippets/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(KF5NewStuff QUIET) +find_package(KF5NewStuff ${KF5_DEP_VERSION} QUIET) set_package_properties(KF5NewStuff PROPERTIES PURPOSE "Required to build the snippets addon") if(NOT KF5NewStuff_FOUND) diff --git a/addons/tabswitcher/autotests/CMakeLists.txt b/addons/tabswitcher/autotests/CMakeLists.txt --- a/addons/tabswitcher/autotests/CMakeLists.txt +++ b/addons/tabswitcher/autotests/CMakeLists.txt @@ -3,7 +3,7 @@ add_executable(tabswitcher_test "") target_include_directories(tabswitcher_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) -find_package(Qt5Test QUIET REQUIRED) +find_package(Qt5Test ${QT_MIN_VERSION} QUIET REQUIRED) target_link_libraries( tabswitcher_test PRIVATE diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(KF5DocTools QUIET) +find_package(KF5DocTools ${KF5_DEP_VERSION} QUIET) if(NOT KF5DocTools_FOUND) return() diff --git a/kate/CMakeLists.txt b/kate/CMakeLists.txt --- a/kate/CMakeLists.txt +++ b/kate/CMakeLists.txt @@ -21,7 +21,7 @@ ) find_package( - KF5 + KF5 ${KF5_DEP_VERSION} QUIET REQUIRED COMPONENTS diff --git a/kate/autotests/CMakeLists.txt b/kate/autotests/CMakeLists.txt --- a/kate/autotests/CMakeLists.txt +++ b/kate/autotests/CMakeLists.txt @@ -1,6 +1,6 @@ include(ECMMarkAsTest) -find_package(Qt5Test QUIET REQUIRED) +find_package(Qt5Test ${QT_MIN_VERSION} QUIET REQUIRED) macro(kate_executable_tests) foreach(_testname ${ARGN}) diff --git a/kwrite/CMakeLists.txt b/kwrite/CMakeLists.txt --- a/kwrite/CMakeLists.txt +++ b/kwrite/CMakeLists.txt @@ -4,7 +4,7 @@ target_include_directories(kwrite PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) # config.h find_package( - KF5 + KF5 ${KF5_DEP_VERSION} QUIET REQUIRED COMPONENTS