diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2006-07-13 13:14:26 +0000 |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2006-07-13 13:14:26 +0000 |
| commit | 3ee8f55fc4ef03d3c164bf1ce451dacd881cb3f3 (patch) | |
| tree | a8c8a61d1fd0601f7414ca21d0cd6dded5df9f95 | |
| parent | fd3a1772eded684647d10ac39f4eb2ef14ec0d9c (diff) | |
| download | extra-cmake-modules-3ee8f55fc4ef03d3c164bf1ce451dacd881cb3f3.tar.gz extra-cmake-modules-3ee8f55fc4ef03d3c164bf1ce451dacd881cb3f3.tar.bz2 | |
handle win32 support in FindKDE4Internal.cmake
svn path=/trunk/KDE/kdelibs/; revision=561849
| -rw-r--r-- | modules/FindGNUWIN32.cmake | 1 | ||||
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/FindGNUWIN32.cmake b/modules/FindGNUWIN32.cmake index 8b1b15a6..ca2c8b9e 100644 --- a/modules/FindGNUWIN32.cmake +++ b/modules/FindGNUWIN32.cmake @@ -11,7 +11,6 @@ if (GNUWIN32_DIR) set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include) set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib) set(GNUWIN32_BINARY_DIR ${GNUWIN32_DIR}/bin) - set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GNUWIN32_INCLUDE_DIR}) set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${GNUWIN32_LIBRARY_DIR}) set(GNUWIN32_FOUND TRUE) else (GNUWIN32_DIR) diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index b723517f..7f1e2117 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -449,7 +449,9 @@ if (WIN32) find_package(KDEWIN32 REQUIRED) - set( _KDE4_PLATFORM_INCLUDE_DIRS ${KDEWIN32_INCLUDES}) + find_package(GNUWIN32) + + set( _KDE4_PLATFORM_INCLUDE_DIRS ${KDEWIN32_INCLUDES} ${GNUWIN32_INCLUDE_DIR}) # if we are compiling kdelibs, add KDEWIN32_LIBRARIES explicitely, # otherwise they come from KDELibsDependencies.cmake, Alex |