summaryrefslogtreecommitdiffstats
path: root/Utilities/Doxygen
diff options
context:
space:
mode:
authorSebastien Barre <sebastien.barre@kitware.com>2001-11-02 21:44:25 (GMT)
committerSebastien Barre <sebastien.barre@kitware.com>2001-11-02 21:44:25 (GMT)
commit2fcf59b96b6ac41a1963c8b0f2b06d61c8f255a2 (patch)
treecf9a6d535c9be697d655bed41b8a0c407e578058 /Utilities/Doxygen
parent3714d9419c3f90a753bb7e96c9260b674f486916 (diff)
downloadCMake-2fcf59b96b6ac41a1963c8b0f2b06d61c8f255a2.zip
CMake-2fcf59b96b6ac41a1963c8b0f2b06d61c8f255a2.tar.gz
CMake-2fcf59b96b6ac41a1963c8b0f2b06d61c8f255a2.tar.bz2
Update
Diffstat (limited to 'Utilities/Doxygen')
-rw-r--r--Utilities/Doxygen/CMakeLists.txt2
-rwxr-xr-xUtilities/Doxygen/doc_makeall.sh.in21
2 files changed, 8 insertions, 15 deletions
diff --git a/Utilities/Doxygen/CMakeLists.txt b/Utilities/Doxygen/CMakeLists.txt
index f17215b..b2f121a 100644
--- a/Utilities/Doxygen/CMakeLists.txt
+++ b/Utilities/Doxygen/CMakeLists.txt
@@ -1,7 +1,7 @@
#
# Build the documentation
#
-INCLUDE (${CMAKE_ROOT}/Modules/DocumentationVTK.cmake OPTIONAL)
+INCLUDE (${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
IF (BUILD_DOCUMENTATION)
diff --git a/Utilities/Doxygen/doc_makeall.sh.in b/Utilities/Doxygen/doc_makeall.sh.in
index f3e7b81..2229573 100755
--- a/Utilities/Doxygen/doc_makeall.sh.in
+++ b/Utilities/Doxygen/doc_makeall.sh.in
@@ -1,6 +1,6 @@
# -------------------------------------------------------------------------
# Doxygen documentation batch
-# modified by S. Barre (Time-stamp: <2001-11-02 15:58:40 barre>
+# modified by S. Barre (Time-stamp: <2001-11-02 16:40:58 barre>
# -------------------------------------------------------------------------
# Path to several tools (_PROG to avoid the typical GZIP env var pb)
@@ -74,7 +74,7 @@ export DOXYFILE=$DOXTEMP/doxyfile
# Path to the Doxygen output directory (where the resulting doc is stored).
# Note: should be the same as your doxyfile's OUTPUT_DIRECTORY
# If ON, allows the output directory to be erased when some advanced output
-# file have been produced (HTML Help, or TAR archive for example).
+# file have been produced (HTML Help for example).
# Example:
# OUTPUT_DIRECTORY=$DOXTEMP/doc
# ALLOW_ERASE_OUTPUT_DIRECTORY=ON
@@ -104,9 +104,6 @@ export RESULTING_HTML_HELP_FILE=$DOXTEMP/$PROJECT_NAME.chm
# CREATE_HTML_TARZ_ARCHIVE RESULTING_HTML_TARZ_ARCHIVE_FILE:
# Create a compressed (gzip) tar archive of the html directory (located
# under the OUTPUT_DIRECTORY), and name of the resulting archive file.
-# Note: if ON, the whole $OUTPUT_DIRECTORY will be erased at the end of
-# this script, since this file is considered to be one of the
-# advanced final output, unless ALLOW_ERASE_OUTPUT_DIRECTORY is OFF
# Note: your doxyfile should be configured to enable HTML creation
# (using GENERATE_HTML = YES)
# Example:
@@ -116,13 +113,17 @@ export RESULTING_HTML_HELP_FILE=$DOXTEMP/$PROJECT_NAME.chm
# RESULTING_HTML_TARZ_ARCHIVE_FILE=$DOXTEMP/$PROJECT_NAME-html.tar.gz
#
export CREATE_HTML_TARZ_ARCHIVE=@DOCUMENTATION_HTML_TARZ@
-export RESULTING_HTML_TARZ_ARCHIVE_FILE=$DOXTEMP/vtk4-html.tar.gz
export RESULTING_HTML_TARZ_ARCHIVE_FILE=$DOXTEMP/$PROJECT_NAME-html.tar.gz
# ----------------------------------------------------------------------------
# Create the Doxygen doc.
if test "x$DOXYGEN_PROG" != "xNOTFOUND" ; then
+
+ if test "x$RM_PROG" != "xNOTFOUND" ; then
+ $RM_PROG -fr $OUTPUT_DIRECTORY
+ fi
+
$DOXYGEN_PROG $DOXYFILE
fi
@@ -181,12 +182,4 @@ if test "x$RM_PROG" != "xNOTFOUND" ; then
fi
fi
fi
-
- if test "x$CREATE_HTML_TARZ_ARCHIVE" == "xON" ; then
- if test "x$RESULTING_HTML_TARZ_ARCHIVE_FILE" != "x" ; then
- if test "x$ALLOW_ERASE_OUTPUT_DIRECTORY" == "xON" ; then
- $RM_PROG -fr $OUTPUT_DIRECTORY
- fi
- fi
- fi
fi