From kde-commits Tue Apr 30 21:17:16 2013 From: David Faure Date: Tue, 30 Apr 2013 21:17:16 +0000 To: kde-commits Subject: [attica] lib: Fix previous commit, due to if(Qt5Core_FOUND) checks further down Message-Id: <20130430211716.E33AAA603F () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=136735664517093 Git commit c1c0220fbed0468754886c7d2775d55b8c56cc8a by David Faure. Committed on 30/04/2013 at 23:16. Pushed by dfaure into branch 'master'. Fix previous commit, due to if(Qt5Core_FOUND) checks further down M +4 -2 lib/CMakeLists.txt http://commits.kde.org/attica/c1c0220fbed0468754886c7d2775d55b8c56cc8a diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index e0781ac..6b6f191 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -6,8 +6,10 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ ${CMAKE_MODULE_PA= TH}) = option(QT4_BUILD "Force building with Qt4 even if Qt5 is found") -find_package(Qt5Core QUIET) -if (Qt5Core_FOUND AND NOT QT4_BUILD) +if (NOT QT4_BUILD) + find_package(Qt5Core QUIET) +endif() +if (Qt5Core_FOUND) message(STATUS "Building with Qt5 support") find_package(ECM 0.0.6 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})