diff options
| author | David Faure <faure@kde.org> | 2007-11-02 18:07:21 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2007-11-02 18:07:21 +0000 |
| commit | 2c295cadb5ee1ef26c5de02ede5548cda5d14b6a (patch) | |
| tree | 86bc77e20e7ae4c106559582c4311c59d01cd7f4 /modules/FindKdcraw.cmake | |
| parent | b5ef260fcbaabe41644d184c18c64f0b2b3ba8e9 (diff) | |
| download | extra-cmake-modules-2c295cadb5ee1ef26c5de02ede5548cda5d14b6a.tar.gz extra-cmake-modules-2c295cadb5ee1ef26c5de02ede5548cda5d14b6a.tar.bz2 | |
Fix configuring extragear as a single module; to set the right paths we need to determine if we found the file in libfoo or in libs/libfoo.
svn path=/trunk/KDE/kdelibs/; revision=732065
Diffstat (limited to 'modules/FindKdcraw.cmake')
| -rw-r--r-- | modules/FindKdcraw.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/FindKdcraw.cmake b/modules/FindKdcraw.cmake index 8a903309..9c611384 100644 --- a/modules/FindKdcraw.cmake +++ b/modules/FindKdcraw.cmake @@ -24,10 +24,16 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) if (KDCRAW_LOCAL_FOUND) - set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkdcraw) + # Was it found in libkdcraw/ or in libs/libkdcraw? + FIND_FILE(KDCRAW_LOCAL_FOUND_IN_LIBS libkdcraw/version.h ${CMAKE_BINARY_DIR}/libs/libkdcraw NO_DEFAULT_PATH) + if (KDCRAW_LOCAL_FOUND_IN_LIBS) + set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libkdcraw) + else (KDCRAW_LOCAL_FOUND_IN_LIBS) + set(KDCRAW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkdcraw) + endif (KDCRAW_LOCAL_FOUND_IN_LIBS) set(KDCRAW_DEFINITIONS -I${KDCRAW_INCLUDE_DIR}) set(KDCRAW_LIBRARIES kdcraw) - message(STATUS "Found Kdcraw library in local sub-folder: ${KDCRAW_LIBRARIES}") + message(STATUS "Found Kdcraw library in local sub-folder: ${KDCRAW_INCLUDE_DIR}") set(KDCRAW_FOUND TRUE) MARK_AS_ADVANCED(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES) |