[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/soprano/cmake/modules
From:       Maciej Mrozowski <reavertm () gmail ! com>
Date:       2009-12-18 14:33:45
Message-ID: 1261146825.376781.7824.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1063426 by mmrozowski:

Check all redland storage libs this time and not just the first found (will detect \
broken virtuoso storage backend in redland 1.0.10)

CCMAIL: neundorf@kde.org
CCMAIL: trueg@k3b.org

 M  +14 -11    FindRedland.cmake  


--- trunk/kdesupport/soprano/cmake/modules/FindRedland.cmake #1063425:1063426
@@ -82,19 +82,22 @@
   # Look for unresolved symbols in shared librdf_storage_* libs
   set(_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
-  find_library(_REDLAND_STORAGE_LIBS
-    NAMES
-    rdf_storage_mysql librdf_storage_mysql
-    rdf_storage_sqlite librdf_storage_sqlite
-    rdf_storage_tstore librdf_storage_tstore
-    rdf_storage_postgresql librdf_storage_postgresql
-    rdf_storage_virtuoso librdf_storage_virtuoso
-    HINTS
-    ${redland_LIBRARY_DIRS}
-    PATH_SUFFIXES redland
-  )
+  set(_REDLAND_STORAGE_LIBS)
+  foreach(_STORAGE_LIB rdf_storage_mysql rdf_storage_sqlite rdf_storage_tstore \
rdf_storage_postgresql rdf_storage_virtuoso) +    set(_LIB_PATH NOTFOUND)
+    find_library(_LIB_PATH
+      ${_STORAGE_LIB}
+      HINTS
+      ${redland_LIBRARY_DIRS}
+      PATH_SUFFIXES redland
+    )
+    if(_LIB_PATH)
+      set(_REDLAND_STORAGE_LIBS ${_REDLAND_STORAGE_LIBS} ${_LIB_PATH})
+    endif(_LIB_PATH)
+  endforeach(_STORAGE_LIB)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${_SUFFIXES})
   if(_REDLAND_STORAGE_LIBS)
+    message(STATUS "Found Redland storage: ${_REDLAND_STORAGE_LIBS}")
     try_run(_TEST_EXITCODE _TEST_COMPILED
       "${CMAKE_CURRENT_BINARY_DIR}"
       "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CheckLibraryLoads.c"


[prev in list] [next in list] [prev in thread] [next in thread]