[Openvas-commits] r12012 - in trunk/gsd: . doc

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2011-11-07 10:56:32 +0100 (Mon, 07 Nov 2011)
New Revision: 12012

Modified:
   trunk/gsd/ChangeLog
   trunk/gsd/doc/CMakeLists.txt
Log:
* doc/CMakeLists.txt: If doxygen is not available, disable the
  affected targets instead of failing completely, making behaviour
  consistent with the other OpenVAS modules. Fix suggested by Hanno
  Boeck.


Modified: trunk/gsd/ChangeLog
===================================================================
--- trunk/gsd/ChangeLog	2011-11-07 09:39:07 UTC (rev 12011)
+++ trunk/gsd/ChangeLog	2011-11-07 09:56:32 UTC (rev 12012)
@@ -1,3 +1,10 @@
+2011-11-07  Michael Wiegand <michael.wiegand at greenbone.net>
+
+	* doc/CMakeLists.txt: If doxygen is not available, disable the
+	affected targets instead of failing completely, making behaviour
+	consistent with the other OpenVAS modules. Fix suggested by Hanno
+	Boeck.
+
 2011-09-12  Henri Doreau <henri.doreau at greenbone.net>
 
 	* src/translations/gsd_fr.ts: Fixed typo.

Modified: trunk/gsd/doc/CMakeLists.txt
===================================================================
--- trunk/gsd/doc/CMakeLists.txt	2011-11-07 09:39:07 UTC (rev 12011)
+++ trunk/gsd/doc/CMakeLists.txt	2011-11-07 09:56:32 UTC (rev 12012)
@@ -52,24 +52,25 @@
 include (FindDoxygen)
 
 if (NOT DOXYGEN_EXECUTABLE)
-  message (FATAL_ERROR "Doxygen is required to build the HTML docs.")
-endif (NOT DOXYGEN_EXECUTABLE)
+  message (STATUS "WARNING: Doxygen is required to build the HTML docs.")
+else (NOT DOXYGEN_EXECUTABLE)
 
-add_custom_target (doc COMMENT "Building documentation..."
-  DEPENDS Doxyfile .built-html)
+  add_custom_target (doc COMMENT "Building documentation..."
+    DEPENDS Doxyfile .built-html)
 
-add_custom_command (OUTPUT .built-html
-  COMMAND sh
-  ARGS -c \"cd .. && ${DOXYGEN_EXECUTABLE} doc/Doxyfile && touch doc/.built-html\;\"
-  DEPENDS Doxyfile ../README ../src/*.cpp ../src/*.h)
+  add_custom_command (OUTPUT .built-html
+    COMMAND sh
+    ARGS -c \"cd .. && ${DOXYGEN_EXECUTABLE} doc/Doxyfile && touch doc/.built-html\;\"
+    DEPENDS Doxyfile ../README ../src/*.cpp ../src/*.h)
 
-add_custom_target (doc-full COMMENT "Building documentation..."
-  DEPENDS Doxyfile_full .built-html_full)
+  add_custom_target (doc-full COMMENT "Building documentation..."
+    DEPENDS Doxyfile_full .built-html_full)
 
-add_custom_command (OUTPUT .built-html_full
-  COMMAND sh
-  ARGS -c \"cd .. && ${DOXYGEN_EXECUTABLE} doc/Doxyfile_full && touch doc/.built-html_full\;\"
-  DEPENDS Doxyfile_full ../README ../src/*.cpp ../src/*.h)
+  add_custom_command (OUTPUT .built-html_full
+    COMMAND sh
+    ARGS -c \"cd .. && ${DOXYGEN_EXECUTABLE} doc/Doxyfile_full && touch doc/.built-html_full\;\"
+    DEPENDS Doxyfile_full ../README ../src/*.cpp ../src/*.h)
+endif (NOT DOXYGEN_EXECUTABLE)
 
 if (XMLTOMAN_EXECUTABLE)
   add_custom_target (man COMMENT "Building manual page..."