[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-330-g6aaaa6d
Brad King
brad.king at kitware.com
Mon Mar 17 09:49:57 EDT 2014
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 6aaaa6d0bd584b05a1492b3861e3589f5ffe544d (commit)
via ea17a03be5794a934991b1f958cab12b7011da74 (commit)
via 6e466c6f2ee5160202aaa76a9d643d34bd7d908a (commit)
via c903b5319bfcf383964c625bb84d7bc958aba2e9 (commit)
from 5a21cbc96bb5905638cca978f5996c60b7f940fa (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=6aaaa6d0bd584b05a1492b3861e3589f5ffe544d
commit 6aaaa6d0bd584b05a1492b3861e3589f5ffe544d
Merge: 5a21cbc ea17a03
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 17 09:49:56 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 17 09:49:56 2014 -0400
Merge topic 'CONFIG-LOCATION-CMP0026'
ea17a03b cmTarget: Port <CONFIG>_LOCATION support to updated string APIs
6e466c6f Merge branch 'master' into CONFIG-LOCATION-CMP0026
c903b531 cmTarget: Restore <CONFIG>_LOCATION to CMP0026 OLD behavior (#14808)
-----------------------------------------------------------------------
Summary of changes:
Help/policy/CMP0026.rst | 7 ++++---
Source/cmTarget.cxx | 15 +++++++++++++++
.../CMP0026-CONFIG-LOCATION-NEW-result.txt} | 0
...tderr.txt => CMP0026-CONFIG-LOCATION-NEW-stderr.txt} | 2 +-
...0026-NEW.cmake => CMP0026-CONFIG-LOCATION-NEW.cmake} | 2 +-
.../CMP0026-CONFIG-LOCATION-OLD-result.txt} | 0
.../CMP0026-CONFIG-LOCATION-OLD-stderr.txt} | 0
.../RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD.cmake | 7 +++++++
.../CMP0026-CONFIG-LOCATION-WARN-result.txt} | 0
...derr.txt => CMP0026-CONFIG-LOCATION-WARN-stderr.txt} | 2 +-
...26-WARN.cmake => CMP0026-CONFIG-LOCATION-WARN.cmake} | 2 +-
.../CMP0026-LOCATION-CONFIG-NEW-result.txt} | 0
...tderr.txt => CMP0026-LOCATION-CONFIG-NEW-stderr.txt} | 2 +-
...0026-NEW.cmake => CMP0026-LOCATION-CONFIG-NEW.cmake} | 2 +-
.../CMP0026-LOCATION-CONFIG-OLD-result.txt} | 0
.../CMP0026-LOCATION-CONFIG-OLD-stderr.txt} | 0
.../RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD.cmake | 7 +++++++
.../CMP0026-LOCATION-CONFIG-WARN-result.txt} | 0
...derr.txt => CMP0026-LOCATION-CONFIG-WARN-stderr.txt} | 2 +-
...26-WARN.cmake => CMP0026-LOCATION-CONFIG-WARN.cmake} | 2 +-
Tests/RunCMake/CMP0026/RunCMakeTest.cmake | 6 ++++++
21 files changed, 47 insertions(+), 11 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CMP0026/CMP0026-CONFIG-LOCATION-NEW-result.txt} (100%)
copy Tests/RunCMake/CMP0026/{CMP0026-NEW-stderr.txt => CMP0026-CONFIG-LOCATION-NEW-stderr.txt} (86%)
copy Tests/RunCMake/CMP0026/{CMP0026-NEW.cmake => CMP0026-CONFIG-LOCATION-NEW.cmake} (63%)
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0026/CMP0026-CONFIG-LOCATION-OLD-result.txt} (100%)
copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD.cmake
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0026/CMP0026-CONFIG-LOCATION-WARN-result.txt} (100%)
copy Tests/RunCMake/CMP0026/{CMP0026-WARN-stderr.txt => CMP0026-CONFIG-LOCATION-WARN-stderr.txt} (86%)
copy Tests/RunCMake/CMP0026/{CMP0026-WARN.cmake => CMP0026-CONFIG-LOCATION-WARN.cmake} (52%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CMP0026/CMP0026-LOCATION-CONFIG-NEW-result.txt} (100%)
copy Tests/RunCMake/CMP0026/{CMP0026-NEW-stderr.txt => CMP0026-LOCATION-CONFIG-NEW-stderr.txt} (86%)
copy Tests/RunCMake/CMP0026/{CMP0026-NEW.cmake => CMP0026-LOCATION-CONFIG-NEW.cmake} (63%)
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0026/CMP0026-LOCATION-CONFIG-OLD-result.txt} (100%)
copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD.cmake
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CMP0026/CMP0026-LOCATION-CONFIG-WARN-result.txt} (100%)
copy Tests/RunCMake/CMP0026/{CMP0026-WARN-stderr.txt => CMP0026-LOCATION-CONFIG-WARN-stderr.txt} (86%)
copy Tests/RunCMake/CMP0026/{CMP0026-WARN.cmake => CMP0026-LOCATION-CONFIG-WARN.cmake} (52%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list