Skip to content

Commit

Permalink
feat(freetype): properly disable system deps, use zlib component
Browse files Browse the repository at this point in the history
  • Loading branch information
igrr committed Apr 19, 2024
1 parent e90d4a7 commit db1d7ec
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
19 changes: 11 additions & 8 deletions freetype/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
idf_component_register()

set(CMAKE_SYSTEM_IGNORE_PATH "/usr/include;/usr/lib/x86_64-linux-gnu")
set(BUILD_SHARED_LIBS OFF)

function(install)
endfunction()
# Override options defined in freetype/CMakeLists.txt.
# We could have used normal set(...) here if freetype enabled CMake policy CMP0077.
option(FT_DISABLE_HARFBUZZ "" ON)
option(FT_DISABLE_BZIP2 "" ON)
option(FT_DISABLE_BROTLI "" ON)
option(FT_DISABLE_PNG "" ON)
option(FT_REQUIRE_ZLIB "" ON)

function(export)
endfunction()
# These are regular CMake variables, so we can set them directly.
set(SKIP_INSTALL_ALL TRUE)
set(BUILD_SHARED_LIBS OFF)

add_subdirectory(freetype output)
target_compile_options(freetype PRIVATE "-Wno-dangling-pointer")

target_link_libraries(${COMPONENT_LIB} INTERFACE freetype)
target_link_libraries(${COMPONENT_LIB} INTERFACE freetype)
5 changes: 4 additions & 1 deletion freetype/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
version: "2.13.0~2"
version: "2.13.0~3"
description: freetype C library
url: https://github.com/espressif/idf-extra-components/tree/master/freetype
repository: "https://github.com/espressif/idf-extra-components.git"
documentation: "https://freetype.org/freetype2/docs/documentation.html"
issues: "https://github.com/espressif/idf-extra-components/issues" # URL of the issue tracker
dependencies:
idf: ">=4.4"
zlib:
version: "^1.3.0~1"
override_path: "../zlib"
sbom:
manifests:
- path: sbom_freetype.yml
Expand Down

0 comments on commit db1d7ec

Please sign in to comment.