[Cmake-commits] CMake branch, master, updated. v3.3.2-1313-g5ed2292

[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  5ed2292d3a5a914c2c6a8432e77ecce633fbfc63 (commit)
       via  6e2a4087f2ff93fcea8391963a4101fce52ee94d (commit)
       via  993d064197b36de9e18131afc4ace753b8570d0b (commit)
      from  ac5ead4a9ccf9995a8a7afdfd7a7a5e46668c23a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ed2292d3a5a914c2c6a8432e77ecce633fbfc63
commit 5ed2292d3a5a914c2c6a8432e77ecce633fbfc63
Merge: ac5ead4 6e2a408
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 28 10:44:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 28 10:44:48 2015 -0400

    Merge topic 'ninja-cleanup-path-conversion'
    
    6e2a4087 Ninja: Centralize path conversion in global generator (#15757)
    993d0641 Ninja: Fix OBJECT_DIR placeholder substitution in link rules


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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx       |   33 ++++++++++++++++++-------------
 Source/cmGlobalNinjaGenerator.h         |   13 ++++++++++++
 Source/cmLocalNinjaGenerator.cxx        |   18 ++++++-----------
 Source/cmLocalNinjaGenerator.h          |   15 --------------
 Source/cmNinjaNormalTargetGenerator.cxx |    4 +++-
 Source/cmNinjaTargetGenerator.cxx       |    4 ++--
 Source/cmNinjaTargetGenerator.h         |    8 ++++----
 Tests/OutOfBinary/CMakeLists.txt        |    2 ++
 Tests/OutOfBinary/outexe.c              |    2 ++
 Tests/OutOfSource/SubDir/CMakeLists.txt |    2 ++
 Tests/OutOfSource/SubDir/subdir.c       |    1 +
 11 files changed, 54 insertions(+), 48 deletions(-)
 create mode 100644 Tests/OutOfBinary/outexe.c
 create mode 100644 Tests/OutOfSource/SubDir/subdir.c


hooks/post-receive
-- 
CMake