aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurélien Gâteau <agateau@kde.org>2014-03-13 11:01:07 +0100
committerAurélien Gâteau <agateau@kde.org>2014-03-13 11:01:07 +0100
commit245e758cb94c0abd7e8a87c5349c49a5de1c146f (patch)
tree74978429ccf7937c77f6e540f9e30aceebedebee
parent19429ffd51fdefbf89c72d8de1e6c1312d4734d0 (diff)
downloadkconfig-245e758cb94c0abd7e8a87c5349c49a5de1c146f.tar.gz
kconfig-245e758cb94c0abd7e8a87c5349c49a5de1c146f.tar.bz2
Normalize vars to avoid odd bugs: QT_REQUIRED_VERSION => REQUIRED_QT_VERSION
-rw-r--r--CMakeLists.txt4
-rw-r--r--autotests/CMakeLists.txt4
-rw-r--r--src/gui/CMakeLists.txt4
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