From f62fa7129e2c19a99602b4a527529355acaf1069 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 31 Mar 2006 09:50:21 +0000
Subject: Complain about specific files in a non-clean srcdir; don't insert
 /usr/local/include too early; move X11 includes into DCOP_INCLUDES in a clean
 fashion (I hope).

svn path=/trunk/KDE/kdelibs/; revision=524801
---
 modules/FindKDE4Internal.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index ce4dc08e..ef3ca780 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -471,7 +471,7 @@ endif (WIN32)
 # also use /usr/local by default under UNIX, including Mac OS X
 if (UNIX)
    link_directories(/usr/local/lib)
-   include_directories(/usr/local/include)
+   set( _KDE4_PLATFORM_INCLUDE_DIRS /usr/local/include )
 
    # the rest is RPATH handling
    set(RPATH_STYLE_MATCHED FALSE)
@@ -534,7 +534,8 @@ endif (UNIX)
 # UNIX, except OS X
 if (UNIX AND NOT APPLE)
    find_package(X11 REQUIRED)
-   set(_KDE4_PLATFORM_INCLUDE_DIRS ${X11_INCLUDE_DIR} )
+   # 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