[Cmake-commits] CMake branch, next, updated. v2.8.2-291-gf5585dc
David Cole
david.cole at kitware.com
Wed Jul 28 08:30:05 EDT 2010
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 f5585dc43dcdfe42fdfa403e77dd8bab6676312e (commit)
via 9fa49dc3ad039ed0e1213afcd0da70a064991d27 (commit)
from ef633563768642d25c25c7b9028cb5bcaade8574 (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=f5585dc43dcdfe42fdfa403e77dd8bab6676312e
commit f5585dc43dcdfe42fdfa403e77dd8bab6676312e
Merge: ef63356 9fa49dc
Author: David Cole <david.cole at kitware.com>
AuthorDate: Wed Jul 28 08:30:03 2010 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 28 08:30:03 2010 -0400
Merge topic 'fix-issue-11034' into next
9fa49dc ExternalProject: Remove 'unknown keyword' warning (#11034)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fa49dc3ad039ed0e1213afcd0da70a064991d27
commit 9fa49dc3ad039ed0e1213afcd0da70a064991d27
Author: David Cole <david.cole at kitware.com>
AuthorDate: Wed Jul 28 08:16:08 2010 -0400
Commit: David Cole <david.cole at kitware.com>
CommitDate: Wed Jul 28 08:16:08 2010 -0400
ExternalProject: Remove 'unknown keyword' warning (#11034)
The intent was to warn about misspelled keyword arguments,
but the effect was to warn about valid argument values far
too often. Let's stop annoying and confusing people.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index b74f207..43e7126 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -154,8 +154,8 @@ function(_ep_parse_arguments f name ns args)
# correctly based on target properties.
#
# We loop through ARGN and consider the namespace starting with an
- # upper-case letter followed by at least two more upper-case letters
- # or underscores to be keywords.
+ # upper-case letter followed by at least two more upper-case letters,
+ # numbers or underscores to be keywords.
set(key)
foreach(arg IN LISTS args)
@@ -166,14 +166,6 @@ function(_ep_parse_arguments f name ns args)
NOT arg MATCHES "^(TRUE|FALSE)$")
if(_ep_keywords_${f} AND arg MATCHES "${_ep_keywords_${f}}")
set(is_value 0)
- else()
- if(NOT (key STREQUAL "COMMAND")
- AND NOT (key STREQUAL "CVS_MODULE")
- AND NOT (key STREQUAL "DEPENDS")
- AND NOT (key STREQUAL "DOWNLOAD_COMMAND")
- )
- message(AUTHOR_WARNING "unknown ${f} keyword: ${arg}")
- endif()
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/ExternalProject.cmake | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list