[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6817-gff257c2
Stephen Kelly
steveire at gmail.com
Tue Jan 7 10:14:21 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, next has been updated
via ff257c2ab39cf17a9d801f579cb156ec5013c0d1 (commit)
via 884fb7f5b94e8bdcc28652167ef57e13c7a0ae39 (commit)
via 5d1fc198b744f0af4a8e22f120d1359f31881c9b (commit)
from 5cd9445c36cd2145b311716e550f112170e75289 (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=ff257c2ab39cf17a9d801f579cb156ec5013c0d1
commit ff257c2ab39cf17a9d801f579cb156ec5013c0d1
Merge: 5cd9445 884fb7f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 7 10:14:19 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 7 10:14:19 2014 -0500
Merge topic 'minor-cleanups' into next
884fb7f Remove obsolete workaround for old cmake versions.
5d1fc19 Help: Ensure that target-policies are added to the documentation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=884fb7f5b94e8bdcc28652167ef57e13c7a0ae39
commit 884fb7f5b94e8bdcc28652167ef57e13c7a0ae39
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 7 16:05:19 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jan 7 16:05:19 2014 +0100
Remove obsolete workaround for old cmake versions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a13afa1..761ad20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -589,14 +589,3 @@ install(
# Install auxiliary files integrating with other tools.
add_subdirectory(Auxiliary)
-
-#-----------------------------------------------------------------------
-# End of the main section of the CMakeLists file
-#-----------------------------------------------------------------------
-
-# As a special case when building CMake itself, CMake 2.8.0 and below
-# look up EXECUTABLE_OUTPUT_PATH in the top-level CMakeLists.txt file
-# to compute the location of the "cmake" executable. We set it here
-# so that those CMake versions can find it. We wait until after all
-# the add_subdirectory() calls to avoid affecting the subdirectories.
-set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d1fc198b744f0af4a8e22f120d1359f31881c9b
commit 5d1fc198b744f0af4a8e22f120d1359f31881c9b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 7 16:05:15 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jan 7 16:05:15 2014 +0100
Help: Ensure that target-policies are added to the documentation.
The two most-recently-added policies were not tested for.
diff --git a/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt b/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
index 6533b75..5a80872 100644
--- a/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
+++ b/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
@@ -11,3 +11,8 @@
\* CMP0020
\* CMP0021
\* CMP0022
+ \* CMP0041
+ \* CMP0042
+
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 11 -----------
.../RunCMake/TargetPolicies/PolicyList-stderr.txt | 5 +++++
2 files changed, 5 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list