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

List:       kde-commits
Subject:    branches/soprano/2.2
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2009-02-03 10:58:08
Message-ID: 1233658688.121265.2295.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 920593 by trueg:

backport: apidox build optionally

 M  +17 -14    CMakeLists.txt  
 M  +7 -1      ChangeLog  


--- branches/soprano/2.2/CMakeLists.txt #920592:920593
@@ -18,7 +18,8 @@
 option(SOPRANO_DISABLE_SESAME2_BACKEND "Disable the compilation of the sesame2 \
backend")  option(SOPRANO_DISABLE_CLUCENE_INDEX "Disable the compilation of the \
clucene-based full-text index")  option(SOPRANO_DISABLE_RAPTOR_PARSER "Disable the \
compilation of the raptor parser and serializer plugins (provides most Soprano \
                parsers and serializers)")
-option(SOPRANO_DISABLE_DBUS "Disable the D-Bus integration)")
+option(SOPRANO_DISABLE_DBUS "Disable the D-Bus integration")
+option(SOPRANO_BUILD_API_DOCS "Build the Soprano API documentation")
 
 if(SOPRANO_BUILD_TESTS)
   enable_testing()
@@ -157,22 +158,24 @@
 
 
 ##################  apidox ################################
-find_package(Doxygen)
+if(SOPRANO_BUILD_API_DOCS)
+  find_package(Doxygen)
 
-if(DOXYGEN_EXECUTABLE)
-  configure_file(${soprano_SOURCE_DIR}/Doxyfile.cmake \
${soprano_BINARY_DIR}/Doxyfile) +  if(DOXYGEN_EXECUTABLE)
+    configure_file(${soprano_SOURCE_DIR}/Doxyfile.cmake \
${soprano_BINARY_DIR}/Doxyfile)  
-  if(EXISTS ${QT_DOC_DIR}/html)
-    set(QTDOCS "${QT_DOC_DIR}/html")
-  else(EXISTS ${QT_DOC_DIR}/html)
-    set(QTDOCS "http://doc.trolltech.com/4.3/")
-  endif(EXISTS ${QT_DOC_DIR}/html)
+    if(EXISTS ${QT_DOC_DIR}/html)
+      set(QTDOCS "${QT_DOC_DIR}/html")
+    else(EXISTS ${QT_DOC_DIR}/html)
+      set(QTDOCS "http://doc.trolltech.com/4.3/")
+    endif(EXISTS ${QT_DOC_DIR}/html)
 
-  add_custom_target(
-    apidox
-    COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
-    COMMAND docs/html/installdox -l qt4.tag@${QTDOCS} docs/html/*.html)
-endif(DOXYGEN_EXECUTABLE)
+    add_custom_target(
+      apidox ALL
+      COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile
+      COMMAND docs/html/installdox -l qt4.tag@${QTDOCS} docs/html/*.html)
+  endif(DOXYGEN_EXECUTABLE)
+endif(SOPRANO_BUILD_API_DOCS)
 
 
 ##################  status messages ################################
--- branches/soprano/2.2/ChangeLog #920592:920593
@@ -2,7 +2,13 @@
 	* Properly clear the error in the SparqlModel
 	* Made all D-Bus dependant parts optional for successful compilation on Windows.
 	* Redland include dir fix.
-	* New cmake options to manually disable all optional components.
+	* New cmake options to manually disable all optional components:
+	  - Redland backend
+	  - Sesame2 backend
+	  - Raptor parser/serializer
+	  - CLucene full text index
+	  - D-Bus integration
+	  - Apidox generation
 
 2.2.1
 	* Added removeAllStatements support in SparqlModel (by iterating over all \
statements)


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