diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-22 13:12:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-09-22 13:12:53 (GMT) |
| commit | f28ebcbf1b59fad51833aead76e4f733d7292503 (patch) | |
| tree | 763043f819c3f5bf207a78d7f325b2653ed59de2 /Modules | |
| parent | 5eaa3e90255c8ff8a54e300dd336e0b09f75a2d3 (diff) | |
| parent | fa7d47ac5ce8a2c1006fa73f518a33bab9d83174 (diff) | |
| download | CMake-f28ebcbf1b59fad51833aead76e4f733d7292503.zip CMake-f28ebcbf1b59fad51833aead76e4f733d7292503.tar.gz CMake-f28ebcbf1b59fad51833aead76e4f733d7292503.tar.bz2 | |
Merge topic 'cleanup-CMP0054'
fa7d47ac Tests: Fix CMP0054 warnings
3b5ea54a CheckPrototypeDefinition: Avoid if() auto-dereference
c9b301cd ExternalProject: Fix CMP0054 warning in _ep_parse_arguments
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CheckPrototypeDefinition.cmake | 2 | ||||
| -rw-r--r-- | Modules/ExternalProject.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CheckPrototypeDefinition.cmake b/Modules/CheckPrototypeDefinition.cmake index dfa54d8..e203d4c 100644 --- a/Modules/CheckPrototypeDefinition.cmake +++ b/Modules/CheckPrototypeDefinition.cmake @@ -57,7 +57,7 @@ get_filename_component(__check_proto_def_dir "${CMAKE_CURRENT_LIST_FILE}" PATH) function(CHECK_PROTOTYPE_DEFINITION _FUNCTION _PROTOTYPE _RETURN _HEADER _VARIABLE) - if ("${_VARIABLE}" MATCHES "^${_VARIABLE}$") + if (NOT DEFINED ${_VARIABLE}) set(CHECK_PROTOTYPE_DEFINITION_CONTENT "/* */\n") set(CHECK_PROTOTYPE_DEFINITION_FLAGS ${CMAKE_REQUIRED_FLAGS}) diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 9a78484..d6a6b72 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) |