diff options
| -rw-r--r-- | modules/FindKdcraw.cmake | 10 | ||||
| -rw-r--r-- | modules/FindKexiv2.cmake | 11 | ||||
| -rw-r--r-- | modules/FindKipi.cmake | 9 |
3 files changed, 23 insertions, 7 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) 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) diff --git a/modules/FindKipi.cmake b/modules/FindKipi.cmake index dcf04e5b..de0d046b 100644 --- a/modules/FindKipi.cmake +++ b/modules/FindKipi.cmake @@ -24,10 +24,15 @@ else (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) if (KIPI_LOCAL_FOUND) - set(KIPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkipi) + find_file (KIPI_LOCAL_FOUND_IN_LIBS libkipi/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkipi NO_DEFAULT_PATH) + if (KIPI_LOCAL_FOUND_IN_LIBS) + set(KIPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libkipi) + else (KIPI_LOCAL_FOUND_IN_LIBS) + set(KIPI_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkipi) + endif (KIPI_LOCAL_FOUND_IN_LIBS) set(KIPI_DEFINITIONS -I${KIPI_INCLUDE_DIR}) set(KIPI_LIBRARIES kipi) - message(STATUS "Found Kipi library in local sub-folder: ${KIPI_LIBRARIES}") + message(STATUS "Found Kipi library in local sub-folder: ${KIPI_INCLUDE_DIR}") set(KIPI_FOUND TRUE) mark_as_advanced(KIPI_INCLUDE_DIR KIPI_LIBRARIES) |