[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2542-g8d81738
Stephen Kelly
steveire at gmail.com
Sat Mar 16 16:45:25 EDT 2013
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 8d81738451ca633e3c7234b33035596d6c914078 (commit)
via 67b4a2c377155d054593a275c2da61d835909779 (commit)
from d450412a46849badcbb0a33bf1bf4e36e815c2cc (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=8d81738451ca633e3c7234b33035596d6c914078
commit 8d81738451ca633e3c7234b33035596d6c914078
Merge: d450412 67b4a2c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 16 16:45:22 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 16 16:45:22 2013 -0400
Merge topic 'fix-FPHSA-match' into next
67b4a2c Change the variable check in FPHSA to match the variable.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67b4a2c377155d054593a275c2da61d835909779
commit 67b4a2c377155d054593a275c2da61d835909779
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 16 21:42:19 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 16 21:42:19 2013 +0100
Change the variable check in FPHSA to match the variable.
Otherwise, it seems to match on the content of the variable.
diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
index 5f92a86..70423a7 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -195,7 +195,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
string(TOLOWER ${_NAME} _NAME_LOWER)
if(FPHSA_FOUND_VAR)
- if("${FPHSA_FOUND_VAR}" MATCHES "^${_NAME}_FOUND$" OR "${FPHSA_FOUND_VAR}" MATCHES "^${_NAME_UPPER}_FOUND$")
+ if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$" OR FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
set(_FOUND_VAR ${FPHSA_FOUND_VAR})
else()
message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPackageHandleStandardArgs.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list