[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6020-g81a8ccc
Daniele E. Domenichelli
daniele.domenichelli at gmail.com
Wed Dec 4 04:37:14 EST 2013
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 81a8ccc788ec84ec6c00a4ce17537f04322ed217 (commit)
via 2e189f23eb702fa249fa7f48645f08bc54a79c29 (commit)
via 2f77ffeafe8efcf88168c563c80019647edcf400 (commit)
from 2b59e48b9b6b193a1f24c226fc952739a671154f (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=81a8ccc788ec84ec6c00a4ce17537f04322ed217
commit 81a8ccc788ec84ec6c00a4ce17537f04322ed217
Merge: 2b59e48 2e189f2
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Wed Dec 4 04:37:12 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 4 04:37:12 2013 -0500
Merge topic 'CMakeParseArguments_EmptyArgs' into next
2e189f2 CMakeParseArguments: Make CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY a variable
2f77ffe CMakeParseArguments: Fix tests to run 3.0.0 version before it's released
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e189f23eb702fa249fa7f48645f08bc54a79c29
commit 2e189f23eb702fa249fa7f48645f08bc54a79c29
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Dec 4 10:34:53 2013 +0100
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Dec 4 10:36:02 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/PROPERTY-KEEP.cmake b/Tests/RunCMake/CMakeParseArguments/PROPERTY-KEEP.cmake
index 67046ef..72ebe94 100644
--- a/Tests/RunCMake/CMakeParseArguments/PROPERTY-KEEP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/PROPERTY-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/PROPERTY-SKIP.cmake
index 941d63f..c7fc52c 100644
--- a/Tests/RunCMake/CMakeParseArguments/PROPERTY-SKIP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/PROPERTY-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)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f77ffeafe8efcf88168c563c80019647edcf400
commit 2f77ffeafe8efcf88168c563c80019647edcf400
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Dec 4 10:34:01 2013 +0100
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Dec 4 10:34:01 2013 +0100
CMakeParseArguments: Fix tests to run 3.0.0 version before it's released
diff --git a/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake b/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
index 7293c02..2d68527 100644
--- a/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
@@ -2,7 +2,7 @@ include(RunCMake)
run_cmake(Example)
run_cmake(VERSION-SKIP)
-# run_cmake(VERSION-KEEP) # Enable when 3.0.0 is released
+run_cmake(VERSION-KEEP)
run_cmake(PROPERTY-SKIP)
run_cmake(PROPERTY-KEEP)
run_cmake(ARGUMENT-SKIP)
diff --git a/Tests/RunCMake/CMakeParseArguments/VERSION-KEEP.cmake b/Tests/RunCMake/CMakeParseArguments/VERSION-KEEP.cmake
index 44967ec..2990dc1 100644
--- a/Tests/RunCMake/CMakeParseArguments/VERSION-KEEP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/VERSION-KEEP.cmake
@@ -3,7 +3,10 @@
# CMAKE_PARSE_ARGUMENTS_(KEEP|SKIP)_EMPTY UNSET
# => KEEP
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 2.8.12)
+# This is a hack, required to test the behaviour in CMake 3.0.0 before
+# it is actually released
+set(CMAKE_MINIMUM_REQUIRED_VERSION 3.0.0)
include(CMakeParseArguments)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeParseArguments.cmake | 19 ++++---------------
.../CMakeParseArguments/ARGUMENT-KEEP.cmake | 2 +-
.../CMakeParseArguments/ARGUMENT-SKIP.cmake | 2 +-
.../CMakeParseArguments/PROPERTY-KEEP.cmake | 2 +-
.../CMakeParseArguments/PROPERTY-SKIP.cmake | 2 +-
.../CMakeParseArguments/RunCMakeTest.cmake | 2 +-
.../CMakeParseArguments/VERSION-KEEP.cmake | 5 ++++-
7 files changed, 13 insertions(+), 21 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list