diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-07 20:32:01 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-07 20:32:01 +0000 |
| commit | 33ef2dcde9be9d37e41a3c905f85849e918a240a (patch) | |
| tree | 9c2e9665561385b7a722e18a1095672778a5ef69 /modules | |
| parent | c11fc5de759fa645e301e50fbb4e794c80d1a117 (diff) | |
| download | extra-cmake-modules-33ef2dcde9be9d37e41a3c905f85849e918a240a.tar.gz extra-cmake-modules-33ef2dcde9be9d37e41a3c905f85849e918a240a.tar.bz2 | |
-add -DMAKE_KDEWIN32_LIB to the build in kdelibs/win/
-convert KDECORE_EXPORT in include/mingw to KDEWIN32_EXPORT, is this correct ?
-use CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH in FindKDE4.cmake
Alex
CCMAIL: kde-buildsystem@kde.org
svn path=/trunk/KDE/kdelibs/; revision=506879
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindKDE4.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index 3a9b2dcf..b7ef270d 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -171,8 +171,8 @@ IF (WIN32) # at first find the kdewin32 library, this has to be compiled and installed before kdelibs/ - FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32) - FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h) + FIND_LIBRARY(KDEWIN32_LIBRARY NAMES kdewin32 PATHS ${CMAKE_LIBRARY_PATH}) + FIND_PATH(KDEWIN32_INCLUDE_DIR winposix_export.h ${CMAKE_INCLUDE_PATH}) # kdelibs/win/ has to be built before the rest of kdelibs/ # eventually it will be moved out from kdelibs/ @@ -182,10 +182,10 @@ IF (WIN32) IF(MINGW) #mingw compiler - SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES}) + SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/mingw ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH}) ELSE(MINGW) # msvc compiler - SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ) + SET(KDEWIN32_INCLUDES ${KDEWIN32_INCLUDE_DIR} ${KDEWIN32_INCLUDE_DIR}/msvc ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH}) # add the MS SDK include directory if available SET(MS_SDK_DIR $ENV{MSSdk}) |