[Cmake-commits] CMake branch, master, updated. v2.8.6-125-gc2300e6

[David Cole]

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, master has been updated
       via  c2300e6265400089b8efb5e34e4d33e1425354ac (commit)
       via  76ecdd8d169fd2565466669875b5ed7e7c5c1963 (commit)
      from  e0d97b672875ab83e4e30ddd00746860e6e1fd87 (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=c2300e6265400089b8efb5e34e4d33e1425354ac
commit c2300e6265400089b8efb5e34e4d33e1425354ac
Merge: e0d97b6 76ecdd8
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Nov 1 14:26:21 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 1 14:26:21 2011 -0400

    Merge topic 'fix-12539-ctestconfig-from-build-dir'
    
    76ecdd8 CTest: Look for CTestConfig.cmake in build dir first, then source dir


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

Summary of changes:
 Source/cmCTest.cxx                                 |   32 ++++++++++++++++----
 Tests/CMakeLists.txt                               |   29 ++++++++++++++++++
 Tests/CTestTestConfigFileInBuildDir/CMakeLists.txt |    3 ++
 .../CTestConfig.cmake                              |    4 +-
 .../test1.cmake.in}                                |   10 ++----
 .../test2.cmake.in}                                |   10 ++----
 6 files changed, 68 insertions(+), 20 deletions(-)
 create mode 100644 Tests/CTestTestConfigFileInBuildDir/CMakeLists.txt
 copy Tests/{CTestTestParallel => CTestTestConfigFileInBuildDir}/CTestConfig.cmake (66%)
 copy Tests/{CTestTestCycle/test.cmake.in => CTestTestConfigFileInBuildDir/test1.cmake.in} (78%)
 copy Tests/{CTestTestCycle/test.cmake.in => CTestTestConfigFileInBuildDir/test2.cmake.in} (78%)


hooks/post-receive
-- 
CMake