From 2c8d0b871a3afe6f00e7190a770162abd7a304e8 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Fri, 1 Jul 2016 18:54:51 +0200 Subject: [PATCH] Drop QT_PATH from CMake code If one wants a specific Qt version then simply set QT_QMAKE_EXECUTABLE to the correct binary. This has less possible side effects. --- CMakeLists.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e26e2b37..57480248 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,9 +103,6 @@ endif() # The following options are not for end-user consumption, so don't list them in the feature summary cmake_dependent_option(DEPLOY "Add required libs to bundle resources and create a dmg. Note: requires Qt to be built with 10.4u SDK" OFF "APPLE" OFF) -# Handle with care -set(QT_PATH "" CACHE PATH "Path to a Qt4 installation to use instead of the system Qt (e.g. for static builds)") - # Static builds are not supported and require some manual setup! Don't enable unless you know what you're doing (we don't know either) cmake_dependent_option(STATIC "Enable static building (not supported)" OFF "NOT WITH_KDE" OFF) @@ -371,12 +368,6 @@ else() message(STATUS "Building for Qt4...") set(QT_MIN_VERSION "4.8.0") - # Select a Qt installation here, if you don't want to use system Qt - if(QT_PATH) - # FindQt4 will look for the qmake binary in $PATH, so we just prepend QT_PATH - set(ENV{PATH} ${QT_PATH}/bin:$ENV{PATH}) - endif() - find_package(Qt4 ${QT_MIN_VERSION} QUIET REQUIRED) if (BUILD_GUI) -- 2.20.1