[Cmake-commits] CMake branch, master, updated. v3.5.2-714-ge0da6c3
Brad King
brad.king at kitware.com
Thu May 19 10:41:29 EDT 2016
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 e0da6c3b562f7fd25b83b00c432f016439c24c22 (commit)
via eb076692459a8d4cc214156af3553c36309bdce3 (commit)
via 8a862a4d4b852c9f61ae4ed7fc46042b00a83123 (commit)
via 038e7716e58e4cf79bda6ba72b92814a14978a8f (commit)
via 7c26a6a269b0c12ecdf7605183d9fa26ad2b91eb (commit)
via ac3cdd9af287e653d53b18c432f21a919b102158 (commit)
via d4381cb15df3e81b78b6d8d9e7d9b727a616985d (commit)
via 0397c92a15e505021d75eb0a156a312b024eb85e (commit)
via 3b3ecdfa4872a86dcb8eb7d5f5478259890d4707 (commit)
via 5ca72750c8de3c1c925c433293eb3bc6b3ea234c (commit)
from 43a456e1351fc6c2aca088a55855b7f7c501c100 (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=e0da6c3b562f7fd25b83b00c432f016439c24c22
commit e0da6c3b562f7fd25b83b00c432f016439c24c22
Merge: 43a456e eb07669
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu May 19 10:41:27 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 19 10:41:27 2016 -0400
Merge topic 'ninja-output-path-prefix'
eb076692 Tests: Select RunCMake.Ninja test cases based on ninja version
8a862a4d Ninja: Support embedding of CMake as subninja project
038e7716 Ninja: Pass all build paths through a central method
7c26a6a2 Ninja: Fix path to soname-d target file
ac3cdd9a Ninja: Convert object file names to ninja paths earlier
d4381cb1 Ninja: Convert link library file names like all other output paths
0397c92a Ninja: Pre-compute "CMakeCache.txt" build target name
3b3ecdfa Ninja: Pre-compute "all" build target name
5ca72750 Ninja: Simplify generation of custom target logical path
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-variables.7.rst | 1 +
Help/release/dev/ninja-output-path-prefix.rst | 6 +
Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst | 27 ++++
Source/cmAlgorithms.h | 15 ++
Source/cmGlobalNinjaGenerator.cxx | 88 ++++++++---
Source/cmGlobalNinjaGenerator.h | 11 ++
Source/cmLocalNinjaGenerator.cxx | 12 +-
Source/cmNinjaNormalTargetGenerator.cxx | 3 +-
Source/cmNinjaTargetGenerator.cxx | 20 ++-
Source/cmNinjaUtilityTargetGenerator.cxx | 2 +
Tests/RunCMake/Ninja/CheckNoPrefixSubDir.cmake | 7 +
.../RunCMake/Ninja/CheckNoPrefixSubDirScript.cmake | 8 +
Tests/RunCMake/Ninja/CheckOutput.cmake | 23 +++
.../Ninja/CustomCommandWorkingDirectory.cmake | 13 ++
Tests/RunCMake/Ninja/Executable.cmake | 5 +
Tests/RunCMake/Ninja/RunCMakeTest.cmake | 165 ++++++++++++++++++++
Tests/RunCMake/Ninja/SharedLib.cmake | 8 +
Tests/RunCMake/Ninja/StaticLib.cmake | 9 ++
Tests/RunCMake/Ninja/SubDirPrefix.cmake | 8 +
Tests/RunCMake/Ninja/SubDirPrefix/CMakeLists.txt | 2 +
Tests/RunCMake/Ninja/SubDirPrefix/greeting.c | 9 ++
Tests/RunCMake/Ninja/SubDirPrefix/greeting.h | 4 +
Tests/RunCMake/Ninja/TwoLibs.cmake | 17 ++
Tests/RunCMake/Ninja/greeting.c | 9 ++
Tests/RunCMake/Ninja/greeting.h | 4 +
Tests/RunCMake/Ninja/greeting2.c | 6 +
Tests/RunCMake/Ninja/greeting2.h | 1 +
Tests/RunCMake/Ninja/hello.c | 7 +
Tests/RunCMake/Ninja/hello_sub_greeting.c | 7 +
Tests/RunCMake/Ninja/hello_with_greeting.c | 7 +
Tests/RunCMake/Ninja/hello_with_two_greetings.c | 9 ++
31 files changed, 481 insertions(+), 32 deletions(-)
create mode 100644 Help/release/dev/ninja-output-path-prefix.rst
create mode 100644 Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
create mode 100644 Tests/RunCMake/Ninja/CheckNoPrefixSubDir.cmake
create mode 100644 Tests/RunCMake/Ninja/CheckNoPrefixSubDirScript.cmake
create mode 100644 Tests/RunCMake/Ninja/CheckOutput.cmake
create mode 100644 Tests/RunCMake/Ninja/CustomCommandWorkingDirectory.cmake
create mode 100644 Tests/RunCMake/Ninja/Executable.cmake
create mode 100644 Tests/RunCMake/Ninja/SharedLib.cmake
create mode 100644 Tests/RunCMake/Ninja/StaticLib.cmake
create mode 100644 Tests/RunCMake/Ninja/SubDirPrefix.cmake
create mode 100644 Tests/RunCMake/Ninja/SubDirPrefix/CMakeLists.txt
create mode 100644 Tests/RunCMake/Ninja/SubDirPrefix/greeting.c
create mode 100644 Tests/RunCMake/Ninja/SubDirPrefix/greeting.h
create mode 100644 Tests/RunCMake/Ninja/TwoLibs.cmake
create mode 100644 Tests/RunCMake/Ninja/greeting.c
create mode 100644 Tests/RunCMake/Ninja/greeting.h
create mode 100644 Tests/RunCMake/Ninja/greeting2.c
create mode 100644 Tests/RunCMake/Ninja/greeting2.h
create mode 100644 Tests/RunCMake/Ninja/hello.c
create mode 100644 Tests/RunCMake/Ninja/hello_sub_greeting.c
create mode 100644 Tests/RunCMake/Ninja/hello_with_greeting.c
create mode 100644 Tests/RunCMake/Ninja/hello_with_two_greetings.c
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list