[Cmake-commits] CMake branch, next, updated. v2.8.3-829-g37929fe

[Marcus D. Hanwell]

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  37929fe34bdd226e05c78aa00a0f90a8d360fe4b (commit)
       via  3bc828df9a0869f292de09ddcec306c16fe6d743 (commit)
      from  1f70d7aa3829e8fab044a33f457449febab3180d (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=37929fe34bdd226e05c78aa00a0f90a8d360fe4b
commit 37929fe34bdd226e05c78aa00a0f90a8d360fe4b
Merge: 1f70d7a 3bc828d
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Mon Dec 13 12:52:44 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 13 12:52:44 2010 -0500

    Merge topic 'external-project-args-file' into next
    
    3bc828d Fixed bug where last entry would be lost.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bc828df9a0869f292de09ddcec306c16fe6d743
commit 3bc828df9a0869f292de09ddcec306c16fe6d743
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Mon Dec 13 12:50:38 2010 -0500
Commit:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
CommitDate: Mon Dec 13 12:50:38 2010 -0500

    Fixed bug where last entry would be lost.
    
    The code to build up a list was missing the final entry in an initial
    cache.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 542dbc2..a3590cf 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -579,6 +579,11 @@ function(_ep_write_initial_cache script_filename args)
       set(accumulator "${accumulator};${line}")
     endif()
   endforeach()
+  # Catch the final line of the args
+  if(setArg)
+    set(setArg "${setArg}${accumulator}\" CACHE ${type} \"Initial cache\" FORCE)")
+    set(script_initial_cache "${script_initial_cache}\n${setArg}")
+  endif()
   # Write out the initial cache file to the location specified.
   if(NOT EXISTS "${script_filename}.in")
     file(WRITE "${script_filename}.in" "\@script_initial_cache\@\n")

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

Summary of changes:
 Modules/ExternalProject.cmake |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake