[Cmake-commits] CMake branch, next, updated. v3.0.2-5339-g8b75f1e

Brad King brad.king at kitware.com
Mon Sep 15 16:02:09 EDT 2014


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  8b75f1e2b5b7419d6e1b830a87ef336adb755091 (commit)
       via  c9b301cd7145883611a4ae7f7c09c245581261c2 (commit)
      from  4edb08f2c8806d8f9189127566ed956877b5d03a (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=8b75f1e2b5b7419d6e1b830a87ef336adb755091
commit 8b75f1e2b5b7419d6e1b830a87ef336adb755091
Merge: 4edb08f c9b301c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 15 16:02:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 15 16:02:09 2014 -0400

    Merge topic 'ExternalProject-CMP0054-cleanup' into next
    
    c9b301cd ExternalProject: Fix CMP0054 warning in _ep_parse_arguments


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9b301cd7145883611a4ae7f7c09c245581261c2
commit c9b301cd7145883611a4ae7f7c09c245581261c2
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Mon Sep 15 14:49:25 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 15 15:56:37 2014 -0400

    ExternalProject: Fix CMP0054 warning in _ep_parse_arguments
    
    Fix the CMP0054 warning:
    
     CMake Warning (dev) at .../Modules/ExternalProject.cmake:242 (if):
       Policy CMP0054 is not set: Only interpret if() arguments as variables or
       keywords when unquoted.  Run "cmake --help-policy CMP0054" for policy
       details.  Use the cmake_policy command to set the policy and suppress this
       warning.
    
       Quoted keywords like "COMMAND" will no longer be interpreted as keywords
       when the policy is set to NEW.  Since the policy is not set the OLD
       behavior will be used.
     Call Stack (most recent call first):
       .../Modules/ExternalProject.cmake:1938 (_ep_parse_arguments)
       CMakeLists.txt:5 (ExternalProject_Add)
    
    by avoiding a reference to "${key}" or "COMMAND" in quotes.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index f8c996e..f5ed948 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -240,7 +240,7 @@ function(_ep_parse_arguments f name ns args)
     set(is_value 1)
 
     if(arg MATCHES "^[A-Z][A-Z0-9_][A-Z0-9_]+$" AND
-        NOT ((arg STREQUAL "${key}") AND (key STREQUAL "COMMAND")) AND
+        NOT (("x${arg}x" STREQUAL "x${key}x") AND ("x${key}x" STREQUAL "xCOMMANDx")) AND
         NOT arg MATCHES "^(TRUE|FALSE)$")
       if(_ep_keywords_${f} AND arg MATCHES "${_ep_keywords_${f}}")
         set(is_value 0)

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list