On Monday 11 May 2009 20:14:59 Alexander Neundorf wrote:
> On Monday 11 May 2009, Sebastian Trüg wrote:
> > 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?
>
> No.
>
> Since cmake 2.6.1 (we require 2.6.2) the FIND_XXX() commands have a
> new "HINTS" keyword, which can be used instead of PATHS. The difference is
> that the directories listed with HINTS will be searched before all other
> directories, not after.
> Can you please use this ?
new patch attached.
Index: FindSoprano.cmake
===================================================================
--- FindSoprano.cmake (revision 966382)
+++ FindSoprano.cmake (working copy)
@@ -42,44 +42,44 @@
find_path(SOPRANO_INCLUDE_DIR
NAMES
soprano/soprano.h
- PATHS
+ HINTS
+ ${INCLUDE_INSTALL_DIR}
${KDE4_INCLUDE_DIR}
- ${INCLUDE_INSTALL_DIR}
)
find_library_with_debug(SOPRANO_INDEX_LIBRARIES
WIN32_DEBUG_POSTFIX d
NAMES
sopranoindex
- PATHS
+ HINTS
+ ${LIB_INSTALL_DIR}
${KDE4_LIB_DIR}
- ${LIB_INSTALL_DIR}
)
find_library_with_debug(SOPRANO_CLIENT_LIBRARIES
WIN32_DEBUG_POSTFIX d
NAMES
sopranoclient
- PATHS
+ HINTS
+ ${LIB_INSTALL_DIR}
${KDE4_LIB_DIR}
- ${LIB_INSTALL_DIR}
)
find_library_with_debug(SOPRANO_LIBRARIES
WIN32_DEBUG_POSTFIX d
NAMES soprano
- PATHS
+ HINTS
+ ${LIB_INSTALL_DIR}
${KDE4_LIB_DIR}
- ${LIB_INSTALL_DIR}
)
find_library_with_debug(SOPRANO_SERVER_LIBRARIES
WIN32_DEBUG_POSTFIX d
NAMES
sopranoserver
- PATHS
+ HINTS
+ ${LIB_INSTALL_DIR}
${KDE4_LIB_DIR}
- ${LIB_INSTALL_DIR}
)
# check for all the libs as required to make sure that we do not try to compile with an old version
@@ -178,7 +178,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
