[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-482-gdcae581

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  dcae581eee3c3ef75f0dd5d8241e8ae898e9db74 (commit)
       via  15c6a4c9199e245a31d1e4cf45bd35f279bbc44d (commit)
       via  157396b131c3d7f5c7324972afaf3e185ee726b5 (commit)
      from  8ec6b905a24f367e12486e39ef47ef5d2a3ba495 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcae581eee3c3ef75f0dd5d8241e8ae898e9db74
commit dcae581eee3c3ef75f0dd5d8241e8ae898e9db74
Merge: 8ec6b90 15c6a4c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 16 09:10:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 16 09:10:00 2015 -0400

    Merge topic 'quote-doxygen-tools' into next
    
    15c6a4c9 Utilities/Doxygen: Support tools installed in paths with spaces
    157396b1 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15c6a4c9199e245a31d1e4cf45bd35f279bbc44d
commit 15c6a4c9199e245a31d1e4cf45bd35f279bbc44d
Author:     Michael Stürmer <michael.stuermer at schaeffler.com>
AuthorDate: Tue Jun 16 13:17:55 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 16 09:07:41 2015 -0400

    Utilities/Doxygen: Support tools installed in paths with spaces
    
    Quote paths to tools in generation script.

diff --git a/Utilities/Doxygen/doc_makeall.sh.in b/Utilities/Doxygen/doc_makeall.sh.in
index ed7b521..fceafdd 100755
--- a/Utilities/Doxygen/doc_makeall.sh.in
+++ b/Utilities/Doxygen/doc_makeall.sh.in
@@ -130,7 +130,7 @@ export RESULTING_HTML_TARZ_ARCHIVE_FILE="$DOXTEMP/$PROJECT_NAME-html.tar.gz"
 
 if test "x at VTK_SOURCE_DIR@" != "x" ; then
   if test "x$PERL_PROG" != "xNOTFOUND" ; then
-    $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_contributors.pl" \
+    "$PERL_PROG" "$PATH_TO_VTK_DOX_SCRIPTS/doc_contributors.pl" \
         --authors  "$SOURCE_DIR/Utilities/Doxygen/authors.txt" \
         --cachedir "$DOXTEMP/cache" \
         --class_group '^(cm[A-Z0-9][A-Za-z0-9]+)\.(?:c|cpp|cxx|h|fl)$' \
@@ -158,7 +158,7 @@ if test "x at VTK_SOURCE_DIR@" != "x" ; then
   fi
 
   if test "x$GNUPLOT_PROG" != "xNOTFOUND" ; then
-    $GNUPLOT_PROG "$DOXTEMP/contrib/history.plt"
+    "$GNUPLOT_PROG" "$DOXTEMP/contrib/history.plt"
   fi
 fi
 
@@ -168,7 +168,7 @@ fi
 if test "x$DOXYGEN_PROG" != "xNOTFOUND" ; then
 
     if test "x$RM_PROG" != "xNOTFOUND" ; then
-        $RM_PROG -fr "$OUTPUT_DIRECTORY"
+        "$RM_PROG" -fr "$OUTPUT_DIRECTORY"
     fi
 
     "$DOXYGEN_PROG" "$DOXYFILE"
@@ -182,7 +182,7 @@ fi
 
 if test "x at VTK_SOURCE_DIR@" != "x" ; then
   if test "x$PERL_PROG" != "xNOTFOUND" ; then
-    $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_rmpath.pl" \
+    "$PERL_PROG" "$PATH_TO_VTK_DOX_SCRIPTS/doc_rmpath.pl" \
         --verbose \
         --to "$INTERMEDIATE_DOX_DIR" \
         --html "$OUTPUT_DIRECTORY/html"
@@ -198,7 +198,7 @@ if test "x$COMPILE_HTML_HELP" == "xON" ; then
         if test "x$HHC_PROG" != "xNOTFOUND" ; then
             "$HHC_PROG" index.hhp
             if test "x$MV_PROG" != "xNOTFOUND" ; then
-                $MV_PROG -f index.chm "$RESULTING_HTML_HELP_FILE"
+                "$MV_PROG" -f index.chm "$RESULTING_HTML_HELP_FILE"
             fi
        fi
    fi
@@ -212,15 +212,15 @@ if test "x$CREATE_HTML_TARZ_ARCHIVE" == "xON" ; then
         cd "$OUTPUT_DIRECTORY"
         if test "x$TAR_PROG" != "xNOTFOUND" ; then
             if test "x$RM_PROG" != "xNOTFOUND" ; then
-                $RM_PROG -f html.tar
+                "$RM_PROG" -f html.tar
             fi
-            $TAR_PROG -cf html.tar html
+            "$TAR_PROG" -cf html.tar html
             if test "x$GZIP_PROG" != "xNOTFOUND" ; then
                 if test "x$RM_PROG" != "xNOTFOUND" ; then
-                    $RM_PROG -f html.tar.gz
+                    "$RM_PROG" -f html.tar.gz
                 fi
-                $GZIP_PROG html.tar
-                $MV_PROG -f html.tar.gz "$RESULTING_HTML_TARZ_ARCHIVE_FILE"
+                "$GZIP_PROG" html.tar
+                "$MV_PROG" -f html.tar.gz "$RESULTING_HTML_TARZ_ARCHIVE_FILE"
             fi
        fi
    fi
@@ -230,18 +230,18 @@ fi
 # Clean-up.
 
 if test "x$RM_PROG" != "xNOTFOUND" ; then
-    $RM_PROG -fr "$INTERMEDIATE_DOX_DIR"
+    "$RM_PROG" -fr "$INTERMEDIATE_DOX_DIR"
 
     if test "x$DOWNLOAD_VTK_TAGFILE" == "xON" ; then
         if test "x$VTK_TAGFILE" != "x" ; then
-            $RM_PROG -f "$VTK_TAGFILE_DEST_DIR/$VTK_TAGFILE"
+            "$RM_PROG" -f "$VTK_TAGFILE_DEST_DIR/$VTK_TAGFILE"
         fi
     fi
 
     if test "x$COMPILE_HTML_HELP" == "xON" ; then
         if test "x$RESULTING_HTML_HELP_FILE" != "x" ; then
             if test "x$ALLOW_ERASE_OUTPUT_DIRECTORY" == "xON" ; then
-                $RM_PROG -fr "$OUTPUT_DIRECTORY"
+                "$RM_PROG" -fr "$OUTPUT_DIRECTORY"
             fi
         fi
     fi

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake           |    2 +-
 Utilities/Doxygen/doc_makeall.sh.in |   26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake