[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2644-gffc18aa

[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  ffc18aaf2c4b02c238ba09f3253bbbf3466f4aed (commit)
       via  420280f32265eda0e24b2b11ab9d39491d9e8512 (commit)
      from  245904daf0c56385cd4e4b39f00a2a193d88a3b0 (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=ffc18aaf2c4b02c238ba09f3253bbbf3466f4aed
commit ffc18aaf2c4b02c238ba09f3253bbbf3466f4aed
Merge: 245904d 420280f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 30 16:28:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 30 16:28:38 2014 -0400

    Merge topic 'ExternalProject-verify-cmake-var' into next
    
    420280f3 ExternalProject: Fix path to cmake in verify script


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=420280f32265eda0e24b2b11ab9d39491d9e8512
commit 420280f32265eda0e24b2b11ab9d39491d9e8512
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 30 16:18:13 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 30 16:21:58 2014 -0400

    ExternalProject: Fix path to cmake in verify script
    
    In commit v3.0.0-rc1~103^2~3 (ExternalProject: Reattempt download when
    verification fails, 2014-01-15) a reference to ${CMAKE_COMMAND} was
    added to generate a reference to the CMake command in a cmake script.
    Escape the '$' so that the literal variable reference appears in the
    script instead of writing the path to the current cmake.  This is
    necessary when the path to CMake contains spaces or other characters
    special to CMake syntax.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0df51a8..17cb866 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -605,7 +605,7 @@ does not match expected value
 Retrying download.
 \")
     file(REMOVE \"\${file}\")
-    execute_process(COMMAND ${CMAKE_COMMAND} -P \"${download_script}\")
+    execute_process(COMMAND \${CMAKE_COMMAND} -P \"${download_script}\")
   endif()
 endwhile()
 

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

Summary of changes:
 Modules/ExternalProject.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake