[Cmake-commits] CMake branch, next, updated. v3.0.2-2200-gcb37118
Rolf Eike Beer
eike at sf-mail.de
Sat Oct 25 13:34:03 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 cb3711876ab72b07fd47352b995de13b90781630 (commit)
via 22362c65e1a0e4bc43fb49174cb597b9dfb6227e (commit)
via 97eb511672a8d5804f98942791c7bad9ac73e6df (commit)
via fbc2a384d8d137f2332d0f8de7a23edfac84a361 (commit)
from 33a603aa5558bd107a5d018daeb78659810a8183 (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=cb3711876ab72b07fd47352b995de13b90781630
commit cb3711876ab72b07fd47352b995de13b90781630
Merge: 33a603a 22362c6
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Oct 25 13:34:01 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 25 13:34:01 2014 -0400
Merge topic 'FPHSA-deref' into next
22362c65 FPHSA: remove unneeded variable dereferencing
97eb5116 CMake Nightly Date Stamp
fbc2a384 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22362c65e1a0e4bc43fb49174cb597b9dfb6227e
commit 22362c65e1a0e4bc43fb49174cb597b9dfb6227e
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Oct 24 14:07:21 2014 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Oct 25 19:33:38 2014 +0200
FPHSA: remove unneeded variable dereferencing
These variables can be dereferenced by if() alone so do not do it here, avoiding
the risk of their content being treated as a variable name and dereferenced
again.
diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
index 6bcf1e7..2de1fb3 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -319,7 +319,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
endif ()
unset(_VERSION_HEAD)
else ()
- if (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}")
+ if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL VERSION)
set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
set(VERSION_OK FALSE)
else ()
@@ -329,7 +329,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
unset(_VERSION_DOTS)
else() # minimum version specified:
- if ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
+ if (${_NAME}_FIND_VERSION VERSION_GREATER VERSION)
set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
set(VERSION_OK FALSE)
else ()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPackageHandleStandardArgs.cmake | 4 ++--
Source/CMakeVersion.cmake | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list