[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2373-ga413ccc

[James Bigler]

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  a413ccc433fddff0c1ca0fa6d9cab7f46a3ab55c (commit)
       via  5ab1259140e56863ad913c090bedea288fe8ac54 (commit)
      from  fb71268dbd0e98d7c5d29d7500930e6245352c6d (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=a413ccc433fddff0c1ca0fa6d9cab7f46a3ab55c
commit a413ccc433fddff0c1ca0fa6d9cab7f46a3ab55c
Merge: fb71268 5ab1259
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Mar 4 15:22:53 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 4 15:22:53 2013 -0500

    Merge topic 'FixPreLinkTest' into next
    
    5ab1259 Use PRE_LINK instead of PRE_BUILD when testing PRE_LINK.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ab1259140e56863ad913c090bedea288fe8ac54
commit 5ab1259140e56863ad913c090bedea288fe8ac54
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Mar 4 13:21:41 2013 -0700
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Mon Mar 4 13:21:41 2013 -0700

    Use PRE_LINK instead of PRE_BUILD when testing PRE_LINK.

diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt
index 432dbf8..2613f27 100644
--- a/Tests/Complex/Executable/CMakeLists.txt
+++ b/Tests/Complex/Executable/CMakeLists.txt
@@ -91,7 +91,7 @@ remove_definitions(-DCOMPLEX_DEFINED)
 add_custom_command(TARGET complex PRE_BUILD
                    COMMAND ${CREATE_FILE_EXE}
                    ARGS "${Complex_BINARY_DIR}/Executable/prebuild.txt")
-add_custom_command(TARGET complex PRE_BUILD
+add_custom_command(TARGET complex PRE_LINK
                    COMMAND ${CREATE_FILE_EXE}
                    ARGS "${Complex_BINARY_DIR}/Executable/prelink.txt")
 add_custom_command(TARGET complex POST_BUILD

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

Summary of changes:
 Tests/Complex/Executable/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake