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

List:       kde-commits
Subject:    kdesupport/soprano
From:       Romain Pokrzywka <romain () kdab ! net>
Date:       2010-01-28 20:26:14
Message-ID: 1264710374.941745.23112.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1081593 by pokrzywka:

respect SOPRANO_DISABLE_VIRTUOSO_BACKEND on windows too

 M  +14 -10    CMakeLists.txt  


--- trunk/kdesupport/soprano/CMakeLists.txt #1081592:1081593
@@ -81,13 +81,14 @@
   endif(JAVA_INCLUDE_PATH AND JAVA_JVM_LIBRARY)
 endif(NOT SOPRANO_DISABLE_SESAME2_BACKEND)
 
-if(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND AND NOT WIN32)
-  find_package(IODBC)
-endif(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND AND NOT WIN32)
+if(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND)
 if(WIN32)
   include(CheckIncludeFileCXX)
   check_include_file_cxx(sql.h HAVE_SQL_H)
+else(WIN32)
+  find_package(IODBC)
 endif(WIN32)
+endif(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND)
 
 
 ##################  setup variables  ################################
@@ -113,12 +114,11 @@
 if(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND)
   set(BUILD_DBUS_SUPPORT TRUE)
 endif(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND)
-if(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND AND IODBC_FOUND)
-  set(BUILD_VIRTUOSO_BACKEND TRUE)
-endif(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND AND IODBC_FOUND)
-if(WIN32 AND HAVE_SQL_H)
-  set(BUILD_VIRTUOSO_BACKEND TRUE)
-endif(WIN32 AND HAVE_SQL_H)
+if(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND)
+  if(IODBC_FOUND OR HAVE_SQL_H)
+    set(BUILD_VIRTUOSO_BACKEND TRUE)
+  endif(IODBC_FOUND OR HAVE_SQL_H)
+endif(NOT SOPRANO_DISABLE_VIRTUOSO_BACKEND)
 set(HAVE_DBUS BUILD_DBUS_SUPPORT)
 
 ##################  setup install directories  ################################
@@ -248,7 +248,11 @@
   message("   * Sesame2 storage backend (java-based)")
 endif(NOT BUILD_SESAME2_BACKEND)
 if(NOT BUILD_VIRTUOSO_BACKEND)
-  message("   * Virtuoso storage backend (missing libiodbc - http://www.iodbc.org)")
+  if(WIN32)
+    message("   * Virtuoso storage backend (missing ODBC headers - \
http://msdn.microsoft.com/en-us/windows/bb980924.aspx)") +  else(WIN32)
+    message("   * Virtuoso storage backend (missing libiodbc - \
http://www.iodbc.org)") +  endif(WIN32)
 endif(NOT BUILD_VIRTUOSO_BACKEND)
 
 if(NOT BUILD_RAPTOR_PARSER)


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