[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1024-g0d63bdd

[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  0d63bdd2d9690cfdb43671af7465704675a68733 (commit)
       via  d25ad482e978cbf5e4fcfa8b1dcc342ba93dcda0 (commit)
      from  c0ea0604a0dcd1d580e9b6a976aae0069cab2986 (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=0d63bdd2d9690cfdb43671af7465704675a68733
commit 0d63bdd2d9690cfdb43671af7465704675a68733
Merge: c0ea060 d25ad48
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 2 14:23:09 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 2 14:23:09 2014 -0500

    Merge topic 'rpath-default'
    
    d25ad48 OS X: Add CMP0042 to enable MACOSX_RPATH by default


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

Summary of changes:
 Help/manual/cmake-policies.7.rst                   |    1 +
 Help/manual/cmake-variables.7.rst                  |    1 +
 Help/policy/CMP0042.rst                            |   19 +++++++
 Help/prop_tgt/MACOSX_RPATH.rst                     |   16 +++++--
 Help/variable/CMAKE_MACOSX_RPATH.rst               |    7 +++
 Source/cmComputeLinkInformation.cxx                |    2 +-
 Source/cmGlobalGenerator.cxx                       |   28 ++++++++++
 Source/cmGlobalGenerator.h                         |    5 ++
 Source/cmLocalXCodeGenerator.cxx                   |   29 +++++++++++
 Source/cmLocalXCodeGenerator.h                     |    2 +
 Source/cmPolicies.cxx                              |    5 ++
 Source/cmPolicies.h                                |    1 +
 Source/cmTarget.cxx                                |   53 ++++++++++++++++++--
 Source/cmTarget.h                                  |    8 ++-
 Tests/MacRuntimePath/A/CMakeLists.txt              |    6 ++-
 Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared.cmake |    2 +
 Tests/RunCMake/CMP0022/CMP0022-WARN.cmake          |    2 +
 .../CMP0042-NEW-result.txt}                        |    0
 .../CMP0042-NEW-stderr.txt}                        |    0
 Tests/RunCMake/CMP0042/CMP0042-NEW.cmake           |    4 ++
 .../CMP0042-OLD-result.txt}                        |    0
 .../CMP0042-OLD-stderr.txt}                        |    0
 Tests/RunCMake/CMP0042/CMP0042-OLD.cmake           |    4 ++
 .../CMP0042-WARN-result.txt}                       |    0
 Tests/RunCMake/CMP0042/CMP0042-WARN-stderr.txt     |   10 ++++
 Tests/RunCMake/CMP0042/CMP0042-WARN.cmake          |    9 +++
 Tests/RunCMake/{CMP0041 => CMP0042}/CMakeLists.txt |    0
 Tests/RunCMake/CMP0042/RunCMakeTest.cmake          |    5 ++
 Tests/RunCMake/{CMP0022 => CMP0042}/empty.cpp      |    0
 Tests/RunCMake/CMakeLists.txt                      |    3 +
 30 files changed, 208 insertions(+), 14 deletions(-)
 create mode 100644 Help/policy/CMP0042.rst
 create mode 100644 Help/variable/CMAKE_MACOSX_RPATH.rst
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0042/CMP0042-NEW-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => CMP0042/CMP0042-NEW-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/CMP0042/CMP0042-NEW.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0042/CMP0042-OLD-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => CMP0042/CMP0042-OLD-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/CMP0042/CMP0042-OLD.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0042/CMP0042-WARN-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CMP0042/CMP0042-WARN-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0042/CMP0042-WARN.cmake
 copy Tests/RunCMake/{CMP0041 => CMP0042}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/CMP0042/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0022 => CMP0042}/empty.cpp (100%)


hooks/post-receive
-- 
CMake