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

List:       kde-commits
Subject:    kdesupport/soprano
From:       Stephan Binner <binner () kde ! org>
Date:       2007-05-01 19:50:25
Message-ID: 1178049025.869828.26971.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 660161 by binner:

make it work with rasqal.h in different dir than redland.h


 M  +16 -5     cmake/modules/FindRedland.cmake  
 M  +1 -0      soprano/redland/CMakeLists.txt  


--- trunk/kdesupport/soprano/cmake/modules/FindRedland.cmake #660160:660161
@@ -13,12 +13,12 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 
-if (REDLAND_LIBRARIES AND REDLAND_INCLUDE_DIR)
+if (REDLAND_LIBRARIES AND REDLAND_INCLUDE_DIR AND RASQAL_INCLUDE_DIR)
 
   # in cache already
   set(REDLAND_FOUND TRUE)
 
-else (REDLAND_LIBRARIES AND REDLAND_INCLUDE_DIR)
+else (REDLAND_LIBRARIES AND REDLAND_INCLUDE_DIR and RASQUAL_INCLUDE_DIR)
 
   if (NOT WIN32)
     # use pkg-config to get the directories and then use these values
@@ -28,6 +28,11 @@
     pkgconfig(redland _REDLANDIncDir _REDLANDLinkDir _REDLANDLinkFlags _REDLANDCflags)
 
     set(REDLAND_DEFINITIONS ${_REDLANDCflags} CACHE INTERNAL "The compilation flags for redland")
+
+
+    pkgconfig(rasqal _RASQALIncDir _RASQALLinkDir _RASQALLinkFlags _RASQALCflags)
+
+    set(RASQAL_DEFINITIONS ${_RASQALCflags} CACHE INTERNAL "The compilation flags for rasqal")
   endif (NOT WIN32)
 
   find_path(REDLAND_INCLUDE_DIR redland.h
@@ -36,14 +41,20 @@
     /usr/X11/include
   )
 
+  find_path(RASQAL_INCLUDE_DIR rasqal.h
+    PATHS
+    ${_RASQALIncDir}
+    /usr/X11/include
+  )
+
   find_library(REDLAND_LIBRARIES NAMES rdf librdf
     PATHS
     ${_REDLANDLinkDir}
   )
 
-  if (REDLAND_LIBRARIES AND REDLAND_INCLUDE_DIR)
+  if (REDLAND_LIBRARIES AND REDLAND_INCLUDE_DIR AND RASQAL_INCLUDE_DIR)
      set(REDLAND_FOUND TRUE)
-  endif (REDLAND_LIBRARIES AND REDLAND_INCLUDE_DIR)
+  endif (REDLAND_LIBRARIES AND REDLAND_INCLUDE_DIR AND RASQAL_INCLUDE_DIR)
 
   if (REDLAND_FOUND)
     if (NOT Redland_FIND_QUIETLY)
@@ -57,4 +68,4 @@
 
 #  mark_as_advanced(REDLAND_LIBRARIES)
 
-endif (REDLAND_LIBRARIES AND REDLAND_INCLUDE_DIR)
+endif (REDLAND_LIBRARIES AND REDLAND_INCLUDE_DIR AND RASQAL_INCLUDE_DIR)
--- trunk/kdesupport/soprano/soprano/redland/CMakeLists.txt #660160:660161
@@ -11,6 +11,7 @@
   ${soprano_core_SOURCE_DIR}
   ${soprano_redland_BINARY_DIR}
   ${REDLAND_INCLUDE_DIR}
+  ${RASQAL_INCLUDE_DIR}
   ${CMAKE_INSTALL_PREFIX}/include
 )
 
[prev in list] [next in list] [prev in thread] [next in thread]