diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-01-22 18:15:11 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-01-22 18:15:11 +0000 |
| commit | 5b1774853f2618ad398bffd71d3111e101a819d0 (patch) | |
| tree | 9d90cf9f4fca306c7185a187d329ffa1c530f19e /kde4 | |
| parent | 71e286cff4be54ac5a71898141234bd210882be5 (diff) | |
| download | extra-cmake-modules-5b1774853f2618ad398bffd71d3111e101a819d0.tar.gz extra-cmake-modules-5b1774853f2618ad398bffd71d3111e101a819d0.tar.bz2 | |
- add the X11 incklude dirs
-fix for CheckTypeSize.cmake
-add thread library (required in cmake)
Alex
svn path=/trunk/KDE/kdesdk/cmake/; revision=501365
Diffstat (limited to 'kde4')
| -rw-r--r-- | kde4/FindKDE4.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kde4/FindKDE4.cmake b/kde4/FindKDE4.cmake index 2df6b765..8e4c4d4d 100644 --- a/kde4/FindKDE4.cmake +++ b/kde4/FindKDE4.cmake @@ -27,6 +27,16 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.2) +IF(UNIX) + IF(APPLE) + MESSAGE(SEND_ERROR "Mac OSX not yet supported by FindKDE4.cmake and KDE4Macros.cmake, please edit them as required") + ELSE(APPLE) + FIND_PACKAGE(X11 REQUIRED) + ENDIF(APPLE) +ELSE(UNIX) + MESSAGE(SEND_ERROR "Win32 not yet supported by FindKDE4.cmake and KDE4Macros.cmake, please edit them as required") +ENDIF(UNIX) + #this line includes FindQt.cmake, which searches the Qt library and headers INCLUDE(FindQt4) @@ -209,7 +219,7 @@ IF (NOT KDE4_FIND_QUIETLY) ENDIF (NOT KDE4_FIND_QUIETLY) #add the found Qt and KDE include directories to the current include path -SET(KDE4_INCLUDE_DIRS ${QT_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}) +SET(KDE4_INCLUDE_DIRS ${QT_INCLUDES} ${KDE4_INCLUDE_DIR} ${X11_INCLUDE_DIR} ) #INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${KDE4_INCLUDE_DIR} .) #LINK_DIRECTORIES(${KDE4_LIB_DIR}) |