[Cmake-commits] CMake branch, master, updated. v2.8.11.2-551-g8521a90

Brad King brad.king at kitware.com
Mon Jul 22 09:48:46 EDT 2013


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  8521a909bad292ac8ccdf00b3b6cdd11ca8dc526 (commit)
       via  603bc5998f4892996c9b189a2b2f86695e79e96e (commit)
       via  e645ff0b10567e400c722dfc28c58dc4fd8d181b (commit)
      from  fd8746d038992801f8b9f82246937ba6884624bd (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=8521a909bad292ac8ccdf00b3b6cdd11ca8dc526
commit 8521a909bad292ac8ccdf00b3b6cdd11ca8dc526
Merge: fd8746d 603bc59
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 22 09:48:44 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 22 09:48:44 2013 -0400

    Merge topic 'rpath-on-mac'
    
    603bc59 OS X: Fix regression handling frameworks for Ninja
    e645ff0 OS X: Enable rpath support on Mac OS X when find_library() is used.


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

Summary of changes:
 Source/cmComputeLinkInformation.cxx     |   20 ++++++++++++++++----
 Source/cmGlobalNinjaGenerator.cxx       |    8 +++++++-
 Source/cmNinjaNormalTargetGenerator.cxx |    6 ++++--
 Source/cmOrderDirectories.cxx           |   22 ++++++++--------------
 Tests/MacRuntimePath/A/CMakeLists.txt   |    5 +++++
 Tests/MacRuntimePath/A/framework2.cpp   |    8 ++++++++
 Tests/MacRuntimePath/A/framework2.h     |   17 +++++++++++++++++
 Tests/MacRuntimePath/B/CMakeLists.txt   |    3 ++-
 8 files changed, 67 insertions(+), 22 deletions(-)
 create mode 100644 Tests/MacRuntimePath/A/framework2.cpp
 create mode 100644 Tests/MacRuntimePath/A/framework2.h


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list