From: msv Date: Fri, 15 Jul 2022 14:24:13 +0000 (+0300) Subject: Correct freetype include path for wasm build X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=7136ecdc734039bd9882bcd789fd7defbb5f2c1a;p=occt.git Correct freetype include path for wasm build --- diff --git a/adm/scripts/wasm_build.sh b/adm/scripts/wasm_build.sh index b02a3080c1..3840e966f5 100755 --- a/adm/scripts/wasm_build.sh +++ b/adm/scripts/wasm_build.sh @@ -66,8 +66,8 @@ echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \ -DINSTALL_DIR_INCLUDE:STRING="inc" \ -DINSTALL_DIR_RESOURCE:STRING="src" \ -D3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \ --D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \ --D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \ +-D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include/freetype2" \ +-D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include/freetype2" \ -DBUILD_MODULE_FoundationClasses:BOOL="ON" \ -DBUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \ -DBUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \ @@ -84,8 +84,8 @@ cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \ -DINSTALL_DIR_INCLUDE:STRING="inc" \ -DINSTALL_DIR_RESOURCE:STRING="src" \ -D3RDPARTY_FREETYPE_DIR:PATH="$aFreeType" \ --D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include" \ --D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include" \ +-D3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2:FILEPATH="$aFreeType/include/freetype2" \ +-D3RDPARTY_FREETYPE_INCLUDE_DIR_ft2build:FILEPATH="$aFreeType/include/freetype2" \ -DBUILD_MODULE_FoundationClasses:BOOL="ON" \ -DBUILD_MODULE_ModelingData:BOOL="${BUILD_ModelingData}" \ -DBUILD_MODULE_ModelingAlgorithms:BOOL="${BUILD_ModelingAlgorithms}" \