2021-11-13 22:27:29 +01:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2022-10-30 19:55:14 +01:00
|
|
|
index d87a7052d..837867551 100644
|
2021-11-13 22:27:29 +01:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -153,19 +153,8 @@ endif()
|
|
|
|
|
|
|
|
|
|
mapnik_find_package(Freetype REQUIRED)
|
|
|
|
|
|
|
|
|
|
-# try to find harfbuzz with the native configuration and fallback to our "own" FindHarfBuzz
|
|
|
|
|
-mapnik_find_package(harfbuzz CONFIG QUIET)
|
|
|
|
|
-if(harfbuzz_FOUND)
|
|
|
|
|
- message(STATUS "Found harfbuzz native cmake")
|
|
|
|
|
- list(APPEND MAPNIK_OPTIONAL_LIBS harfbuzz::harfbuzz)
|
|
|
|
|
-else()
|
2022-10-30 19:55:14 +01:00
|
|
|
- # Use pkg-config when harfbuzz is not found.
|
2021-11-13 22:27:29 +01:00
|
|
|
- # It might be possible that in future version harfbuzz could only be found via pkg-config.
|
|
|
|
|
- # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653
|
|
|
|
|
- message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...")
|
|
|
|
|
- pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz>=${HARFBUZZ_MIN_VERSION})
|
|
|
|
|
- list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz)
|
|
|
|
|
-endif()
|
|
|
|
|
+pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz)
|
|
|
|
|
+list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz)
|
|
|
|
|
|
|
|
|
|
if(USE_EXTERNAL_MAPBOX_GEOMETRY)
|
|
|
|
|
# this is used to provide a way to specify include dirs with CACHE VARIABLES
|
