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/FindKexiv2.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/FindKexiv2.cmake')
| -rw-r--r-- | modules/FindKexiv2.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index f493da41..da19ff8e 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -19,15 +19,20 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) message(STATUS "Check Kexiv2 library in local sub-folder...") # Check if library is not in local sub-folder - + FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libkexiv2 ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) if (KEXIV2_LOCAL_FOUND) - set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) + FIND_FILE(KEXIV2_LOCAL_FOUND_IN_LIBS libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) + if (KEXIV2_LOCAL_FOUND_IN_LIBS) + set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libkexiv2) + else (KEXIV2_LOCAL_FOUND_IN_LIBS) + set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) + endif (KEXIV2_LOCAL_FOUND_IN_LIBS) set(KEXIV2_DEFINITIONS -I${KEXIV2_INCLUDE_DIR}) set(KEXIV2_LIBRARIES kexiv2) - message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_LIBRARIES}") + message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_INCLUDE_DIR}") set(KEXIV2_FOUND TRUE) MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) |