diff options
| author | Adriaan de Groot <groot@kde.org> | 2006-03-31 09:50:21 +0000 |
|---|---|---|
| committer | Adriaan de Groot <groot@kde.org> | 2006-03-31 09:50:21 +0000 |
| commit | f62fa7129e2c19a99602b4a527529355acaf1069 (patch) | |
| tree | dc3dd75c08a79a0435f40662aff6aa8d63c7be56 | |
| parent | cfda42b6f7bcea9c6adbedb9de584049b384afb6 (diff) | |
| download | extra-cmake-modules-f62fa7129e2c19a99602b4a527529355acaf1069.tar.gz extra-cmake-modules-f62fa7129e2c19a99602b4a527529355acaf1069.tar.bz2 | |
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
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
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) |