From 245e758cb94c0abd7e8a87c5349c49a5de1c146f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Thu, 13 Mar 2014 11:01:07 +0100 Subject: Normalize vars to avoid odd bugs: QT_REQUIRED_VERSION => REQUIRED_QT_VERSION --- CMakeLists.txt | 4 ++-- autotests/CMakeLists.txt | 4 ++-- src/gui/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2972f3fa..417cd9cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,9 +5,9 @@ project(KConfig) find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -set(QT_REQUIRED_VERSION 5.2.0) +set(REQUIRED_QT_VERSION 5.2.0) -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Gui Xml) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Xml) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index 93745a99..b45b210a 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -3,8 +3,8 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) include(ECMMarkAsTest) -find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG QUIET) -find_package(Qt5Concurrent ${QT_REQUIRED_VERSION} CONFIG QUIET) +find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET) +find_package(Qt5Concurrent ${REQUIRED_QT_VERSION} CONFIG QUIET) if(NOT Qt5Test_FOUND) message(STATUS "Qt5Test not found, autotests will not be built.") diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 05fe3a25..ad0ff16a 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,6 +1,6 @@ -find_package(Qt5Gui ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) -find_package(Qt5Xml ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) +find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) set(libkconfiggui_SRCS kconfiggui.cpp -- cgit v1.2.1