From f045d177f407b5a91d499c59350e168fb30c3505 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Wed, 26 Apr 2017 20:03:05 +0200 Subject: CMake: prevent confusing "Git NOT FOUND" in CMake 3.1.3 Change-Id: Ia7c03220f49ff862bf05a34727bf5c99297deeab Reviewed-on: https://code.wireshark.org/review/21358 Reviewed-by: Peter Wu --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7334777b70..f0935b7040 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -924,7 +924,10 @@ foreach(PACKAGE ${PACKAGELIST}) else() find_package(${PACKAGE}) endif() - if (${PACKAGE_VAR}_FOUND) + # FindPackageHandleStandardArgs before CMake 3.2 always uses uppercase + # for the FOUND variables (e.g. GIT_FOUND is set, but not Git_FOUND). + string(TOUPPER "${PACKAGE_VAR}" PACKAGE_VAR_UPPER) + if (${PACKAGE_VAR}_FOUND OR ${PACKAGE_VAR_UPPER}_FOUND) message(STATUS "${PACKAGE_VAR} FOUND") set(HAVE_LIB${PACKAGE_VAR} 1) if (NOT DEFINED ${PACKAGE_VAR}_INCLUDE_DIRS) -- cgit v1.2.1