summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-03-18 13:41:59 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-03-18 13:41:59 (GMT)
commit68e86af6f749ba0fadf8e7c358e7aa79cb52e8dd (patch)
treeeee40d004d35208d6792f4518e9bb8182d501c37
parent85f7caabbba5319c561b75db7bbb7562789af2dd (diff)
parent78e6217f314f22fa531261ee16b519a0dd751def (diff)
downloadCMake-68e86af6f749ba0fadf8e7c358e7aa79cb52e8dd.zip
CMake-68e86af6f749ba0fadf8e7c358e7aa79cb52e8dd.tar.gz
CMake-68e86af6f749ba0fadf8e7c358e7aa79cb52e8dd.tar.bz2
Merge topic 'fix-FPHSA-match'
78e6217 FPHSA: Fix FOUND_VAR check to work with if() auto-dereference
-rw-r--r--Modules/FindPackageHandleStandardArgs.cmake2
1 files changed, 1 insertions, 1 deletions
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.")