]> OCCT Git - occt.git/commitdiff
Correct freetype include path for wasm build CR0-750-Hybrid
authormsv <msv@opencascade.com>
Fri, 15 Jul 2022 14:24:13 +0000 (17:24 +0300)
committermsv <msv@opencascade.com>
Fri, 15 Jul 2022 14:24:13 +0000 (17:24 +0300)
adm/scripts/wasm_build.sh

index b02a3080c1853494444b902c24fa544a2e4b9219..3840e966f5ba37a2ba7b837b18edf06849e3503f 100755 (executable)
@@ -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}" \