From 9199fe5b5ade52543889b7b312e69e214fb5d62c Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Sun, 13 May 2012 00:08:12 +0200 Subject: search inqt5 in FindQt5Transitional Since this is stuff which is in Qt5, we search inqt5 automatically when we hit the Qt4 path. Except if FindQt5Transitional is called from building kdelibs or inqt5 itself, and also not if it has already been found (happens in QtMimeTypes) Alex --- find-modules/FindQt5Transitional.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'find-modules/FindQt5Transitional.cmake') diff --git a/find-modules/FindQt5Transitional.cmake b/find-modules/FindQt5Transitional.cmake index 22023546..fa79b922 100644 --- a/find-modules/FindQt5Transitional.cmake +++ b/find-modules/FindQt5Transitional.cmake @@ -58,6 +58,14 @@ else() endforeach() find_package(Qt4 REQUIRED ${_components}) include_directories(${QT_INCLUDES}) + + # if we are not called from a build of a complete kdelibs, which contains libinqt5, + # additionally search for libinqt5: + if(NOT kdelibs_SOURCE_DIR AND NOT inqt5_SOURCE_DIR AND NOT TARGET inqt5) + find_package(inqt5 REQUIRED NO_MODULE) + include_directories(${inqt5_INCLUDE_DIR}) + endif() + if(QT4_FOUND) set(Qt5Transitional_FOUND TRUE) endif() -- cgit v1.2.1