From 70d0d8890aff351f33c1b661c8afba50834eed41 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 7 Sep 2015 23:32:53 -0300 Subject: CMake: Remove support for QTDIR environment variable Using this variable is problematic is the user has several versions of Qt installed on their system. There is no way to know ahead of time if the Qt version pointed to by QTDIR matches the toolchain that is being targeted. The Qt installation path can still be easily specified if it's not found by CMake by setting the Qt5_DIR cache variable after the initial configuration run, so this shouldn't present an usability issue. --- CMakeLists.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b619e06fb..55880990c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,17 +190,11 @@ if (ENABLE_QT) if (DEFINED QT_VER) download_bundled_external("qt/" ${QT_VER} QT_PREFIX) endif() - elseif (DEFINED ENV{QTDIR}) - # Set CMAKE_PREFIX_PATH if QTDIR is defined in the environment This allows CMake to - # automatically find the Qt packages on Windows - set(QT_PREFIX "$ENV{QTDIR}") - endif() - # Passing an empty HINTS seems to cause default system paths to get ignored in CMake 2.8 so make - # sure to not pass anything if we don't have one - if (DEFINED QT_PREFIX) set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") else() + # Passing an empty HINTS seems to cause default system paths to get ignored in CMake 2.8 so + # make sure to not pass anything if we don't have one. set(QT_PREFIX_HINT) endif() -- cgit v1.2.3