[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1301-ga7f5a6e
Brad King
brad.king at kitware.com
Mon Feb 3 11:10:59 EST 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 a7f5a6ee12872135ef9b153ba5bce54012d4b926 (commit)
via 41d2f2c4cbf41bfe3ba7118c1fea0ed5e2f5f683 (commit)
via 7e142c5ac2be11097f7ff905b1606179803043d7 (commit)
via 16d040c958c68c38b2c0642b4094245af28c1910 (commit)
via 00007dcc365797f71ebba2c7d31ab20abc4019e6 (commit)
from ee8e63d0c46f687e320796a851c9696770739df4 (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=a7f5a6ee12872135ef9b153ba5bce54012d4b926
commit a7f5a6ee12872135ef9b153ba5bce54012d4b926
Merge: ee8e63d 41d2f2c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 3 11:10:58 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 3 11:10:58 2014 -0500
Merge topic 'project-version-variables'
41d2f2c4 write_basic_package_version_file: use PROJECT_VERSION
7e142c5a project: Manage VERSION variables
16d040c9 project: Add optional LANGUAGES keyword
00007dcc Help: Format project command and variable documentation
-----------------------------------------------------------------------
Summary of changes:
Help/command/project.rst | 68 ++++++---
Help/manual/cmake-policies.7.rst | 1 +
Help/manual/cmake-variables.7.rst | 11 ++
Help/policy/CMP0048.rst | 22 +++
.../CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst | 6 +
Help/variable/PROJECT-NAME_BINARY_DIR.rst | 6 +-
Help/variable/PROJECT-NAME_SOURCE_DIR.rst | 6 +-
Help/variable/PROJECT-NAME_VERSION.rst | 11 ++
Help/variable/PROJECT-NAME_VERSION_MAJOR.rst | 5 +
Help/variable/PROJECT-NAME_VERSION_MINOR.rst | 5 +
Help/variable/PROJECT-NAME_VERSION_PATCH.rst | 5 +
Help/variable/PROJECT-NAME_VERSION_TWEAK.rst | 5 +
Help/variable/PROJECT_BINARY_DIR.rst | 2 +-
Help/variable/PROJECT_NAME.rst | 2 +-
Help/variable/PROJECT_SOURCE_DIR.rst | 2 +-
Help/variable/PROJECT_VERSION.rst | 11 ++
Help/variable/PROJECT_VERSION_MAJOR.rst | 5 +
Help/variable/PROJECT_VERSION_MINOR.rst | 5 +
Help/variable/PROJECT_VERSION_PATCH.rst | 5 +
Help/variable/PROJECT_VERSION_TWEAK.rst | 5 +
Modules/CMakePackageConfigHelpers.cmake | 5 +-
Modules/WriteBasicConfigVersionFile.cmake | 8 +-
Source/cmPolicies.cxx | 5 +
Source/cmPolicies.h | 1 +
Source/cmProjectCommand.cxx | 159 +++++++++++++++++++-
Tests/RunCMake/CMakeLists.txt | 1 +
.../CMP0048-NEW-stderr.txt} | 0
Tests/RunCMake/project/CMP0048-NEW-stdout.txt | 30 ++++
Tests/RunCMake/project/CMP0048-NEW.cmake | 19 +++
.../CMP0048-OLD-VERSION-result.txt} | 0
.../project/CMP0048-OLD-VERSION-stderr.txt | 4 +
Tests/RunCMake/project/CMP0048-OLD-VERSION.cmake | 2 +
Tests/RunCMake/project/CMP0048-OLD-stdout.txt | 2 +
Tests/RunCMake/project/CMP0048-OLD.cmake | 6 +
Tests/RunCMake/project/CMP0048-WARN-stderr.txt | 12 ++
Tests/RunCMake/project/CMP0048-WARN.cmake | 3 +
Tests/RunCMake/{CMP0004 => project}/CMakeLists.txt | 0
Tests/RunCMake/project/LanguagesEmpty-stdout.txt | 1 +
Tests/RunCMake/project/LanguagesEmpty.cmake | 3 +
.../RunCMake/project/LanguagesImplicit-stdout.txt | 1 +
Tests/RunCMake/project/LanguagesImplicit.cmake | 3 +
Tests/RunCMake/project/LanguagesNONE-stdout.txt | 1 +
Tests/RunCMake/project/LanguagesNONE.cmake | 3 +
.../LanguagesTwice-result.txt} | 0
Tests/RunCMake/project/LanguagesTwice-stderr.txt | 4 +
Tests/RunCMake/project/LanguagesTwice.cmake | 2 +
Tests/RunCMake/project/RunCMakeTest.cmake | 17 +++
.../project/VersionAndLanguagesEmpty-stdout.txt | 2 +
.../project/VersionAndLanguagesEmpty.cmake | 5 +
Tests/RunCMake/project/VersionEmpty-stdout.txt | 2 +
Tests/RunCMake/project/VersionEmpty.cmake | 6 +
.../VersionInvalid-result.txt} | 0
Tests/RunCMake/project/VersionInvalid-stderr.txt | 4 +
Tests/RunCMake/project/VersionInvalid.cmake | 3 +
.../VersionMissingLanguages-result.txt} | 0
.../project/VersionMissingLanguages-stderr.txt | 4 +
.../RunCMake/project/VersionMissingLanguages.cmake | 3 +
.../project/VersionMissingValueOkay-stdout.txt | 2 +
.../RunCMake/project/VersionMissingValueOkay.cmake | 6 +
.../VersionTwice-result.txt} | 0
Tests/RunCMake/project/VersionTwice-stderr.txt | 4 +
Tests/RunCMake/project/VersionTwice.cmake | 3 +
62 files changed, 490 insertions(+), 34 deletions(-)
create mode 100644 Help/policy/CMP0048.rst
create mode 100644 Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst
create mode 100644 Help/variable/PROJECT-NAME_VERSION.rst
create mode 100644 Help/variable/PROJECT-NAME_VERSION_MAJOR.rst
create mode 100644 Help/variable/PROJECT-NAME_VERSION_MINOR.rst
create mode 100644 Help/variable/PROJECT-NAME_VERSION_PATCH.rst
create mode 100644 Help/variable/PROJECT-NAME_VERSION_TWEAK.rst
create mode 100644 Help/variable/PROJECT_VERSION.rst
create mode 100644 Help/variable/PROJECT_VERSION_MAJOR.rst
create mode 100644 Help/variable/PROJECT_VERSION_MINOR.rst
create mode 100644 Help/variable/PROJECT_VERSION_PATCH.rst
create mode 100644 Help/variable/PROJECT_VERSION_TWEAK.rst
copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt => project/CMP0048-NEW-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/project/CMP0048-NEW-stdout.txt
create mode 100644 Tests/RunCMake/project/CMP0048-NEW.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => project/CMP0048-OLD-VERSION-result.txt} (100%)
create mode 100644 Tests/RunCMake/project/CMP0048-OLD-VERSION-stderr.txt
create mode 100644 Tests/RunCMake/project/CMP0048-OLD-VERSION.cmake
create mode 100644 Tests/RunCMake/project/CMP0048-OLD-stdout.txt
create mode 100644 Tests/RunCMake/project/CMP0048-OLD.cmake
create mode 100644 Tests/RunCMake/project/CMP0048-WARN-stderr.txt
create mode 100644 Tests/RunCMake/project/CMP0048-WARN.cmake
copy Tests/RunCMake/{CMP0004 => project}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/project/LanguagesEmpty-stdout.txt
create mode 100644 Tests/RunCMake/project/LanguagesEmpty.cmake
create mode 100644 Tests/RunCMake/project/LanguagesImplicit-stdout.txt
create mode 100644 Tests/RunCMake/project/LanguagesImplicit.cmake
create mode 100644 Tests/RunCMake/project/LanguagesNONE-stdout.txt
create mode 100644 Tests/RunCMake/project/LanguagesNONE.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => project/LanguagesTwice-result.txt} (100%)
create mode 100644 Tests/RunCMake/project/LanguagesTwice-stderr.txt
create mode 100644 Tests/RunCMake/project/LanguagesTwice.cmake
create mode 100644 Tests/RunCMake/project/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/project/VersionAndLanguagesEmpty-stdout.txt
create mode 100644 Tests/RunCMake/project/VersionAndLanguagesEmpty.cmake
create mode 100644 Tests/RunCMake/project/VersionEmpty-stdout.txt
create mode 100644 Tests/RunCMake/project/VersionEmpty.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => project/VersionInvalid-result.txt} (100%)
create mode 100644 Tests/RunCMake/project/VersionInvalid-stderr.txt
create mode 100644 Tests/RunCMake/project/VersionInvalid.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => project/VersionMissingLanguages-result.txt} (100%)
create mode 100644 Tests/RunCMake/project/VersionMissingLanguages-stderr.txt
create mode 100644 Tests/RunCMake/project/VersionMissingLanguages.cmake
create mode 100644 Tests/RunCMake/project/VersionMissingValueOkay-stdout.txt
create mode 100644 Tests/RunCMake/project/VersionMissingValueOkay.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => project/VersionTwice-result.txt} (100%)
create mode 100644 Tests/RunCMake/project/VersionTwice-stderr.txt
create mode 100644 Tests/RunCMake/project/VersionTwice.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list