diff options
| -rw-r--r-- | modules/FindSoprano.cmake | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index caf52b2b..d3845a03 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -11,14 +11,6 @@ else(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND S FIND_PATH(SOPRANO_INCLUDE_DIR NAMES soprano/soprano.h - PATHS - ${KDE4_INCLUDE_DIR} - ${INCLUDE_INSTALL_DIR} - ) - - FIND_LIBRARY_WITH_DEBUG(SOPRANO_LIBRARIES - WIN32_DEBUG_POSTFIX d - NAMES soprano PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} @@ -38,10 +30,17 @@ else(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND S WIN32_DEBUG_POSTFIX d NAMES sopranoclient + ${KDE4_INCLUDE_DIR} + ${INCLUDE_INSTALL_DIR} + ) + + FIND_LIBRARY_WITH_DEBUG(SOPRANO_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES soprano PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} - ) + ) FIND_LIBRARY_WITH_DEBUG(SOPRANO_SERVER_LIBRARIES WIN32_DEBUG_POSTFIX d @@ -54,9 +53,10 @@ else(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND S # check for all the libs as required to make sure that we do not try to compile with an old version # FIXME: introduce a Soprano version check - if(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_CLIENT_LIBRARIES AND SOPRANO_INDEX_LIBRARIES) + + if(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES) set(Soprano_FOUND TRUE) - endif(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_CLIENT_LIBRARIES AND SOPRANO_INDEX_LIBRARIES) + endif(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES) if(Soprano_FOUND AND SOPRANO_INDEX_LIBRARIES) set(SopranoIndex_FOUND TRUE) @@ -73,8 +73,9 @@ else(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND S if(Soprano_FOUND) if(NOT Soprano_FIND_QUIETLY) message(STATUS "Found Soprano: ${SOPRANO_LIBRARIES}") + message(STATUS "Found Soprano includes: ${SOPRANO_INCLUDE_DIR}") message(STATUS "Found Soprano Index: ${SOPRANO_INDEX_LIBRARIES}") - message(STATUS "Found Soprano Client: ${SOPRANO_INDEX_LIBRARIES}") + message(STATUS "Found Soprano Client: ${SOPRANO_CLIENT_LIBRARIES}") endif(NOT Soprano_FIND_QUIETLY) else(Soprano_FOUND) if(Soprano_FIND_REQUIRED) |