[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-103-g0b8db9c

[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, master has been updated
       via  0b8db9ced19bf6ef3fa8a23625b47a7f9bdfdd4e (commit)
       via  609037f4821c45ed13029074c8669d52c6dc9d71 (commit)
       via  98cdb658e481a23c48ad894bec102ec5f060d72e (commit)
       via  36cf8a1eb9eaa6d01a434d007f707be972e6e383 (commit)
      from  f2805bd01b011604f95f384ce1759c15503d32cc (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=0b8db9ced19bf6ef3fa8a23625b47a7f9bdfdd4e
commit 0b8db9ced19bf6ef3fa8a23625b47a7f9bdfdd4e
Merge: f2805bd 609037f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 31 11:35:07 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 31 11:35:07 2014 -0400

    Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS'
    
    609037f4 ExternalProject: Add unit tests for CMAKE_CACHE_DEFAULT_ARGS
    98cdb658 ExternalProject: Add CMAKE_CACHE_DEFAULT_ARGS arguments
    36cf8a1e Tests/Tutorial: Fix when USE_MYMATH is OFF


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

Summary of changes:
 Modules/ExternalProject.cmake                      |   54 ++++++++++++++++----
 Tests/ExternalProjectLocal/CMakeLists.txt          |    1 +
 Tests/RunCMake/CMakeLists.txt                      |    1 +
 .../ExternalProject/CMAKE_CACHE_ARGS.cmake         |   21 ++++++++
 .../ExternalProject/CMAKE_CACHE_DEFAULT_ARGS.cmake |   21 ++++++++
 .../RunCMake/ExternalProject/CMAKE_CACHE_mix.cmake |   29 +++++++++++
 .../{CMP0004 => ExternalProject}/CMakeLists.txt    |    2 +-
 Tests/RunCMake/ExternalProject/RunCMakeTest.cmake  |    5 ++
 Tests/Tutorial/Step2/tutorial.cxx                  |    8 ++-
 Tests/Tutorial/Step3/tutorial.cxx                  |    8 ++-
 Tests/Tutorial/Step4/tutorial.cxx                  |    8 ++-
 Tests/Tutorial/Step5/tutorial.cxx                  |    8 ++-
 Tests/Tutorial/Step6/tutorial.cxx                  |    8 ++-
 Tests/Tutorial/Step7/tutorial.cxx                  |    8 ++-
 14 files changed, 160 insertions(+), 22 deletions(-)
 create mode 100644 Tests/RunCMake/ExternalProject/CMAKE_CACHE_ARGS.cmake
 create mode 100644 Tests/RunCMake/ExternalProject/CMAKE_CACHE_DEFAULT_ARGS.cmake
 create mode 100644 Tests/RunCMake/ExternalProject/CMAKE_CACHE_mix.cmake
 copy Tests/RunCMake/{CMP0004 => ExternalProject}/CMakeLists.txt (56%)
 create mode 100644 Tests/RunCMake/ExternalProject/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake