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 390474cb8a1771ee605954d6cf3c6d1216be77f9 (commit)
via 84afa2a3ed85eeea3980061407c15f17784f02bc (commit)
from 8bce6e5a88191ba96feb1c19d7f0afa920b8783c (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=390474cb8a1771ee605954d6cf3c6d1216be77f9
commit 390474cb8a1771ee605954d6cf3c6d1216be77f9
Merge: 8bce6e5 84afa2a
Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
AuthorDate: Wed Dec 4 09:24:07 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Dec 4 09:24:07 2013 -0500
Merge topic 'CMakeParseArguments_EmptyArgs' into next
84afa2a CMakeParseArguments: Make CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY
a variable
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84afa2a3ed85eeea3980061407c15f17784f02bc
commit 84afa2a3ed85eeea3980061407c15f17784f02bc
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Wed Dec 4 10:34:53 2013 +0100
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Wed Dec 4 15:23:23 2013 +0100
CMakeParseArguments: Make CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY a
variable
diff --git a/Modules/CMakeParseArguments.cmake
b/Modules/CMakeParseArguments.cmake
index c75d839..de3f164 100644
--- a/Modules/CMakeParseArguments.cmake
+++ b/Modules/CMakeParseArguments.cmake
@@ -49,8 +49,8 @@
# compatibility, if CMAKE_MINIMUM_REQUIRED_VERSION < 3.0.0, the default
# behaviour is to skip empty arguments, otherwise the default behaviour
# is to keep them. Using the CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY
-# directory property the user can explicitly set the default behaviour
-# for a folder and its subfolders.
+# variable the user can explicitly set the default behaviour in current
+# scope.
#
#
#
@@ -154,14 +154,6 @@ if(COMMAND cmake_parse_arguments)
endif()
-define_property(DIRECTORY PROPERTY "CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY"
INHERITED
- BRIEF_DOCS "Whether empty arguments should be skipped or not by default."
- FULL_DOCS
- "See documentation of the cmake_parse_arguments() function in the "
- "CMakeParseArguments module."
- )
-
-
function(_CMAKE_PARSE_ARGUMENTS_INTERNAL prefix _optionNames _singleArgNames
_multiArgNames _skipEmpty)
set(insideValues FALSE)
set(currentArgName)
@@ -248,9 +240,6 @@ macro(CMAKE_PARSE_ARGUMENTS prefix _optionNames
_singleArgNames _multiArgNames)
set(${prefix}_UNPARSED_ARGUMENTS)
- get_property(_defaultSkipEmptySet DIRECTORY PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY SET)
- get_property(_defaultSkipEmpty DIRECTORY PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY)
-
if("x${ARGN}" MATCHES "^xCMAKE_PARSE_ARGUMENTS_(SKIP|KEEP)_EMPTY;?")
if("${CMAKE_MATCH_1}" STREQUAL "SKIP")
set(_skipEmpty 1)
@@ -258,8 +247,8 @@ macro(CMAKE_PARSE_ARGUMENTS prefix _optionNames
_singleArgNames _multiArgNames)
set(_skipEmpty 0)
endif()
string(REGEX REPLACE "^${CMAKE_MATCH_0}" "" ARGN "x${ARGN}")
- elseif(_defaultSkipEmptySet)
- set(_skipEmpty "${_defaultSkipEmpty}")
+ elseif(DEFINED CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY)
+ set(_skipEmpty "${CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY}")
elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.0.0)
# Keep compatibility with previous releases
set(_skipEmpty 1)
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
index 1913713..55e5c0b 100644
--- a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.12)
include(CMakeParseArguments)
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
+set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
macro(MY_INSTALL)
set(options OPTIONAL FAST)
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
index 6e0598c..ae8a920 100644
--- a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.12)
include(CMakeParseArguments)
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
+set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
macro(MY_INSTALL)
set(options OPTIONAL FAST)
diff --git a/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
b/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
index 2d68527..8b72473 100644
--- a/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
@@ -3,8 +3,8 @@ include(RunCMake)
run_cmake(Example)
run_cmake(VERSION-SKIP)
run_cmake(VERSION-KEEP)
-run_cmake(PROPERTY-SKIP)
-run_cmake(PROPERTY-KEEP)
+run_cmake(VARIABLE-SKIP)
+run_cmake(VARIABLE-KEEP)
run_cmake(ARGUMENT-SKIP)
run_cmake(ARGUMENT-KEEP)
run_cmake(DifferentScope)
diff --git a/Tests/RunCMake/CMakeParseArguments/PROPERTY-KEEP.cmake
b/Tests/RunCMake/CMakeParseArguments/VARIABLE-KEEP.cmake
similarity index 89%
rename from Tests/RunCMake/CMakeParseArguments/PROPERTY-KEEP.cmake
rename to Tests/RunCMake/CMakeParseArguments/VARIABLE-KEEP.cmake
index 67046ef..72ebe94 100644
--- a/Tests/RunCMake/CMakeParseArguments/PROPERTY-KEEP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/VARIABLE-KEEP.cmake
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.12)
include(CMakeParseArguments)
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
+set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
macro(MY_INSTALL)
set(options OPTIONAL FAST)
diff --git a/Tests/RunCMake/CMakeParseArguments/PROPERTY-SKIP.cmake
b/Tests/RunCMake/CMakeParseArguments/VARIABLE-SKIP.cmake
similarity index 88%
rename from Tests/RunCMake/CMakeParseArguments/PROPERTY-SKIP.cmake
rename to Tests/RunCMake/CMakeParseArguments/VARIABLE-SKIP.cmake
index 941d63f..c7fc52c 100644
--- a/Tests/RunCMake/CMakeParseArguments/PROPERTY-SKIP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/VARIABLE-SKIP.cmake
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.12)
include(CMakeParseArguments)
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
+set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
macro(MY_INSTALL)
set(options OPTIONAL FAST)
-----------------------------------------------------------------------
Summary of changes:
.../CMakeParseArguments/RunCMakeTest.cmake | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
