[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1141-g69c366a

[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  69c366a28178027a5cf2629c0240d1709ae9ab55 (commit)
       via  be0458c5620d611a772fd3a25312cf5ae6cb492c (commit)
      from  f3a9eb45605638b42ca431731080875470cc229a (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=69c366a28178027a5cf2629c0240d1709ae9ab55
commit 69c366a28178027a5cf2629c0240d1709ae9ab55
Merge: f3a9eb4 be0458c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 9 09:37:17 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 9 09:37:17 2014 -0500

    Merge topic 'optional-install'
    
    be0458c InstallRules: added new variable to disable generation of install rules


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

Summary of changes:
 Help/manual/cmake-variables.7.rst                  |    1 +
 Help/variable/CMAKE_SKIP_INSTALL_RULES.rst         |    7 +
 Source/cmGlobalGenerator.cxx                       |   15 ++-
 Tests/CMakeLists.txt                               |   13 ++
 Tests/MissingInstall/CMakeLists.txt                |   25 ++++
 Tests/MissingInstall/ExpectInstallFail.cmake       |   18 +++
 Tests/MissingInstall/mybin.cpp                     |    1 +
 Tests/RunCMake/CMakeLists.txt                      |    2 +
 Tests/RunCMake/CMakeLists.txt.orig                 |  142 ++++++++++++++++++++
 Tests/RunCMake/{set => install}/CMakeLists.txt     |    0
 Tests/RunCMake/install/RunCMakeTest.cmake          |    4 +
 .../install/SkipInstallRulesNoWarning1-check.cmake |    9 ++
 .../SkipInstallRulesNoWarning1-stderr.txt}         |    0
 .../install/SkipInstallRulesNoWarning1.cmake       |    1 +
 .../install/SkipInstallRulesNoWarning2-check.cmake |    9 ++
 .../SkipInstallRulesNoWarning2-stderr.txt}         |    0
 .../install/SkipInstallRulesNoWarning2.cmake       |    1 +
 .../install/SkipInstallRulesWarning-check.cmake    |    9 ++
 .../install/SkipInstallRulesWarning-stderr.txt     |    3 +
 .../RunCMake/install/SkipInstallRulesWarning.cmake |    2 +
 20 files changed, 260 insertions(+), 2 deletions(-)
 create mode 100644 Help/variable/CMAKE_SKIP_INSTALL_RULES.rst
 create mode 100644 Tests/MissingInstall/CMakeLists.txt
 create mode 100644 Tests/MissingInstall/ExpectInstallFail.cmake
 create mode 100644 Tests/MissingInstall/mybin.cpp
 create mode 100644 Tests/RunCMake/CMakeLists.txt.orig
 copy Tests/RunCMake/{set => install}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/install/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning1-check.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => install/SkipInstallRulesNoWarning1-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning1.cmake
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning2-check.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => install/SkipInstallRulesNoWarning2-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning2.cmake
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesWarning-check.cmake
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesWarning-stderr.txt
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesWarning.cmake


hooks/post-receive
-- 
CMake