Просмотр исходного кода

Merge topic 'fix-issue-11034'

9fa49dc ExternalProject: Remove 'unknown keyword' warning (#11034)
Brad King 15 лет назад
Родитель
Сommit
68efc3ef86
1 измененных файлов с 2 добавлено и 10 удалено
  1. 2 10
      Modules/ExternalProject.cmake

+ 2 - 10
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()