at 23.05-pre 1.2 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index d87a7052d..837867551 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -153,19 +153,8 @@ endif() 6 7 mapnik_find_package(Freetype REQUIRED) 8 9-# try to find harfbuzz with the native configuration and fallback to our "own" FindHarfBuzz 10-mapnik_find_package(harfbuzz CONFIG QUIET) 11-if(harfbuzz_FOUND) 12- message(STATUS "Found harfbuzz native cmake") 13- list(APPEND MAPNIK_OPTIONAL_LIBS harfbuzz::harfbuzz) 14-else() 15- # Use pkg-config when harfbuzz is not found. 16- # It might be possible that in future version harfbuzz could only be found via pkg-config. 17- # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653 18- message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...") 19- pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz>=${HARFBUZZ_MIN_VERSION}) 20- list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz) 21-endif() 22+pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz) 23+list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz) 24 25 if(USE_EXTERNAL_MAPBOX_GEOMETRY) 26 # this is used to provide a way to specify include dirs with CACHE VARIABLES