From 2c295cadb5ee1ef26c5de02ede5548cda5d14b6a Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 2 Nov 2007 18:07:21 +0000 Subject: 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 --- modules/FindKipi.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'modules/FindKipi.cmake') 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) -- cgit v1.2.1