From 7bc7eeccff03cc74fa33a4f967158545e8f4ad0f Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 18 Jun 2006 22:05:14 +0000 Subject: Don't look for X11 again, FindQt4 did it already (if Q_WS_X11) svn path=/trunk/KDE/kdelibs/; revision=552723 --- modules/FindKDE4Internal.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 128bdf17..1492c855 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -169,7 +169,7 @@ INCLUDE (MacroEnsureVersion) cmake_minimum_required(VERSION 2.4.1 FATAL_ERROR) set(QT_MIN_VERSION "4.1.1") -#this line includes FindQt.cmake, which searches the Qt library and headers +#this line includes FindQt4.cmake, which searches the Qt library and headers find_package(Qt4 REQUIRED) # Perl is required for building KDE software, @@ -465,7 +465,8 @@ endif (UNIX) # UNIX, except OS X if (UNIX AND NOT APPLE) - find_package(X11 REQUIRED) + # Done by FindQt4.cmake already + #find_package(X11 REQUIRED) # UNIX has already set _KDE4_PLATFORM_INCLUDE_DIRS, so append set(_KDE4_PLATFORM_INCLUDE_DIRS ${_KDE4_PLATFORM_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ) endif (UNIX AND NOT APPLE) -- cgit v1.2.1