The attached patch first looks for Soprano in the install prefix and only
afterwards in the standard dirs. It is a typical problem that stuff fails to
link since cmake tries to link against the globally installed Soprano instead
of the local development one.
May I commit?
Cheers,
Sebastian
Index: FindSoprano.cmake
===================================================================
--- FindSoprano.cmake (revision 966382)
+++ FindSoprano.cmake (working copy)
@@ -39,48 +39,79 @@
#else(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND SOPRANO_SERVER_LIBRARIES)
include(FindLibraryWithDebug)
+ # We look for everything twice starting with the NO_* option to ensure that local/development versions
+ # are found first
+
find_path(SOPRANO_INCLUDE_DIR
NAMES
soprano/soprano.h
PATHS
+ ${INCLUDE_INSTALL_DIR}
${KDE4_INCLUDE_DIR}
- ${INCLUDE_INSTALL_DIR}
+ NO_DEFAULT_PATH
)
+ find_path(SOPRANO_INCLUDE_DIR
+ NAMES
+ soprano/soprano.h
+ )
find_library_with_debug(SOPRANO_INDEX_LIBRARIES
WIN32_DEBUG_POSTFIX d
NAMES
sopranoindex
PATHS
+ ${LIB_INSTALL_DIR}
${KDE4_LIB_DIR}
- ${LIB_INSTALL_DIR}
+ NO_DEFAULT_PATH
)
+ find_library_with_debug(SOPRANO_INDEX_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES
+ sopranoindex
+ )
find_library_with_debug(SOPRANO_CLIENT_LIBRARIES
WIN32_DEBUG_POSTFIX d
NAMES
sopranoclient
PATHS
+ ${LIB_INSTALL_DIR}
${KDE4_LIB_DIR}
- ${LIB_INSTALL_DIR}
+ NO_DEFAULT_PATH
)
+ find_library_with_debug(SOPRANO_CLIENT_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES
+ sopranoclient
+ )
find_library_with_debug(SOPRANO_LIBRARIES
WIN32_DEBUG_POSTFIX d
NAMES soprano
PATHS
+ ${LIB_INSTALL_DIR}
${KDE4_LIB_DIR}
- ${LIB_INSTALL_DIR}
+ NO_DEFAULT_PATH
)
+ find_library_with_debug(SOPRANO_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES soprano
+ )
find_library_with_debug(SOPRANO_SERVER_LIBRARIES
WIN32_DEBUG_POSTFIX d
NAMES
sopranoserver
PATHS
+ ${LIB_INSTALL_DIR}
${KDE4_LIB_DIR}
- ${LIB_INSTALL_DIR}
+ NO_DEFAULT_PATH
)
+ find_library_with_debug(SOPRANO_SERVER_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES
+ sopranoserver
+ )
# check for all the libs as required to make sure that we do not try to compile with an old version
@@ -178,7 +209,7 @@
if(Soprano_FOUND)
if(NOT Soprano_FIND_QUIETLY)
- message(STATUS "Found Soprano: ${SOPRANO_LIBRARIES}")
+ message(STATUS "Found Soprano version ${SOPRANO_VERSION}: ${SOPRANO_LIBRARIES}")
message(STATUS "Found Soprano includes: ${SOPRANO_INCLUDE_DIR}")
message(STATUS "Found Soprano Index: ${SOPRANO_INDEX_LIBRARIES}")
message(STATUS "Found Soprano Client: ${SOPRANO_CLIENT_LIBRARIES}")
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
