[Cmake-commits] CMake branch, master, updated. v3.13.2-781-gc79b98a
Kitware Robot
kwrobot at kitware.com
Sat Dec 29 16:53:05 EST 2018
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 c79b98af375f33cb4a6db4efdd941c8ee92d5fba (commit)
via 88b40744b5d750f9a8641f97b08855dee03b848b (commit)
from 3fe0b6f0ab5532798206142d5d10c5d39a6bbd6b (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=c79b98af375f33cb4a6db4efdd941c8ee92d5fba
commit c79b98af375f33cb4a6db4efdd941c8ee92d5fba
Merge: 3fe0b6f 88b4074
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Sat Dec 29 21:45:47 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Sat Dec 29 16:45:57 2018 -0500
Merge topic 'remove-include-cmakeparsearguments'
88b40744b5 CMakeParseArguments: Remove superfluous includes of CMakeParseArguments
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Ben Boeckel <ben.boeckel at kitware.com>
Merge-request: !2744
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88b40744b5d750f9a8641f97b08855dee03b848b
commit 88b40744b5d750f9a8641f97b08855dee03b848b
Author: Kyle Edwards <kyle.edwards at kitware.com>
AuthorDate: Thu Dec 13 19:40:23 2018 -0500
Commit: Kyle Edwards <kyle.edwards at kitware.com>
CommitDate: Thu Dec 13 19:51:01 2018 -0500
CMakeParseArguments: Remove superfluous includes of CMakeParseArguments
Because cmake_parse_arguments() has been implemented as a native
command, there is no need to include(CMakeParseArguments) anymore.
Its inclusion has been removed from several CMake modules.
Tests/CMakeOnly/CMakeLists.txt has been changed to include the
*building* CMake's copy of CMakeParseArguments rather than the
*built* CMake's copy. This file included the *built* copy because
when this file was introduced, CMake could still be built with versions
that didn't supply cmake_parse_arguments(). Now, CMake requires 3.1 or
greater, where cmake_parse_arguments() existed but was still in the
form of a module, so we include it from the *building* CMake.
diff --git a/Modules/CheckIPOSupported.cmake b/Modules/CheckIPOSupported.cmake
index ad8852c..0d6ad20 100644
--- a/Modules/CheckIPOSupported.cmake
+++ b/Modules/CheckIPOSupported.cmake
@@ -51,8 +51,6 @@ Examples
#]=======================================================================]
-include(CMakeParseArguments) # cmake_parse_arguments
-
# X_RESULT - name of the final result variable
# X_OUTPUT - name of the variable with information about error
macro(_ipo_not_supported output)
diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index fbce235..4a3e83a 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -97,8 +97,6 @@ Functions
#]=======================================================================]
-include(CMakeParseArguments)
-
function(_FS_GET_FEATURE_SUMMARY _property _var _includeQuiet)
get_property(_fsPkgTypes GLOBAL PROPERTY FeatureSummary_PKG_TYPES)
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 593fff6..1758fb3 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -121,8 +121,6 @@ Example:
#]=======================================================================]
function(protobuf_generate)
- include(CMakeParseArguments)
-
set(_options APPEND_PATH DESCRIPTORS)
set(_singleargs LANGUAGE OUT_VAR EXPORT_MACRO PROTOC_OUT_DIR)
if(COMMAND target_sources)
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index 204d54c..f40524f 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -56,7 +56,7 @@ add_test(CMakeOnly.ProjectInclude ${CMAKE_CMAKE_COMMAND}
-P ${CMAKE_CURRENT_BINARY_DIR}/Test.cmake
)
-include(${CMAKE_SOURCE_DIR}/Modules/CMakeParseArguments.cmake)
+include(CMakeParseArguments)
function(add_major_test module)
cmake_parse_arguments(MAJOR_TEST "NOLANG" "VERSION_VAR" "VERSIONS" ${ARGN})
-----------------------------------------------------------------------
Summary of changes:
Modules/CheckIPOSupported.cmake | 2 --
Modules/FeatureSummary.cmake | 2 --
Modules/FindProtobuf.cmake | 2 --
Tests/CMakeOnly/CMakeLists.txt | 2 +-
4 files changed, 1 insertion(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list