diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-11-11 03:21:47 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-11-11 03:21:47 +0300 |
| commit | f8011249b4050aa816d900cbacae66d46ce4836b (patch) | |
| tree | b75036f0b596cf75df53b712d1ae735bdfea1ab7 | |
| parent | 140a83e2023041fed7e48028faf0f1d3e3faf0fc (diff) | |
deps: fix harfbuzz build on linux
| -rw-r--r-- | build_files/build_environment/cmake/harfbuzz.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build_files/build_environment/cmake/harfbuzz.cmake b/build_files/build_environment/cmake/harfbuzz.cmake index 0ae9b11d627..619ed66f603 100644 --- a/build_files/build_environment/cmake/harfbuzz.cmake +++ b/build_files/build_environment/cmake/harfbuzz.cmake @@ -1,9 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later if(WIN32) - set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV_MSVC} && set FREETYPE_DIR=${LIBDIR}/freetype) + set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV_MSVC}) + set(HARFBUZZ_PKG_ENV FREETYPE_DIR=${LIBDIR}/freetype) else() - set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV} && PKG_CONFIG_PATH=${LIBDIR}/freetype/lib/pkgconfig:${LIBDIR}/brotli/lib/pkgconfig) + set(HARFBUZZ_CONFIGURE_ENV ${CONFIGURE_ENV}) + set(HARFBUZZ_PKG_ENV PKG_CONFIG_PATH=${LIBDIR}/freetype/lib/pkgconfig:${LIBDIR}/brotli/lib/pkgconfig:$PKG_CONFIG_PATH) endif() set(HARFBUZZ_EXTRA_OPTIONS @@ -18,7 +20,8 @@ ExternalProject_Add(external_harfbuzz URL_HASH ${HARFBUZZ_HASH_TYPE}=${HARFBUZZ_HASH} DOWNLOAD_DIR ${DOWNLOAD_DIR} PREFIX ${BUILD_DIR}/harfbuzz - CONFIGURE_COMMAND ${HARFBUZZ_CONFIGURE_ENV} && ${MESON} setup --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS} --default-library static --libdir lib ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build ${BUILD_DIR}/harfbuzz/src/external_harfbuzz + CONFIGURE_COMMAND ${HARFBUZZ_CONFIGURE_ENV} && + ${CMAKE_COMMAND} -E env ${HARFBUZZ_PKG_ENV} ${MESON} setup --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS} --default-library static --libdir lib ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build ${BUILD_DIR}/harfbuzz/src/external_harfbuzz BUILD_COMMAND ninja INSTALL_COMMAND ninja install INSTALL_DIR ${LIBDIR}/harfbuzz |