[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] update-cmake-dep-finders 4dbd244: Fix FindHarfBuzz.cmake doe
From: |
Werner Lemberg |
Subject: |
[freetype2] update-cmake-dep-finders 4dbd244: Fix FindHarfBuzz.cmake doesn't hand min required version properly. |
Date: |
Sun, 16 May 2021 06:22:29 -0400 (EDT) |
branch: update-cmake-dep-finders
commit 4dbd244ae10b975f733907fa5c55b12b2899654d
Author: HALX99 <halx99@live.com>
Commit: Nikolaus Waxweiler <madigens@gmail.com>
Fix FindHarfBuzz.cmake doesn't hand min required version properly.
---
builds/cmake/FindHarfBuzz.cmake | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/builds/cmake/FindHarfBuzz.cmake b/builds/cmake/FindHarfBuzz.cmake
index 409e1b3..b481fa4 100644
--- a/builds/cmake/FindHarfBuzz.cmake
+++ b/builds/cmake/FindHarfBuzz.cmake
@@ -91,7 +91,19 @@ if (HarfBuzz_INCLUDE_DIR AND NOT HarfBuzz_VERSION)
endif ()
if ("${HarfBuzz_FIND_VERSION}" VERSION_GREATER "${HarfBuzz_VERSION}")
- message(FATAL_ERROR "Required version (" ${HarfBuzz_FIND_VERSION} ") is
higher than found version (" ${HarfBuzz_VERSION} ")")
+ if (HarfBuzz_FIND_REQUIRED)
+ message(FATAL_ERROR
+ "Required version (" ${HarfBuzz_FIND_VERSION} ")"
+ " is higher than found version (" ${HarfBuzz_VERSION} ")")
+ else ()
+ message(WARNING
+ "Required version (" ${HarfBuzz_FIND_VERSION} ")"
+ " is higher than found version (" ${HarfBuzz_VERSION} ")")
+ unset(HarfBuzz_VERSION)
+ unset(HarfBuzz_INCLUDE_DIRS)
+ unset(HarfBuzz_LIBRARIES)
+ return ()
+ endif ()
endif ()
# Find components
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] update-cmake-dep-finders 4dbd244: Fix FindHarfBuzz.cmake doesn't hand min required version properly.,
Werner Lemberg <=