Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fontconfig] Add features, fix emscripten #42699

Merged
merged 6 commits into from
Dec 16, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[fontconfig] Make tools optional
dg0yt committed Dec 14, 2024
commit b33fbe409714c42d9072d37cac66ca70000e9367
15 changes: 11 additions & 4 deletions ports/fontconfig/portfile.cmake
Original file line number Diff line number Diff line change
@@ -17,6 +17,11 @@ if("nls" IN_LIST FEATURES)
else()
list(APPEND options "-Dnls=disabled")
endif()
if("tools" IN_LIST FEATURES)
list(APPEND options "-Dtools=enabled")
else()
list(APPEND options "-Dtools=disabled")
endif()

vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"
@@ -91,10 +96,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
endforeach()
endif()

vcpkg_copy_tools(
TOOL_NAMES fc-match fc-cat fc-list fc-pattern fc-query fc-scan fc-cache fc-validate fc-conflist
AUTO_CLEAN
)
if("tools" IN_LIST FEATURES)
vcpkg_copy_tools(
TOOL_NAMES fc-match fc-cat fc-list fc-pattern fc-query fc-scan fc-cache fc-validate fc-conflist
AUTO_CLEAN
)
endif()

configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
4 changes: 4 additions & 0 deletions ports/fontconfig/vcpkg.json
Original file line number Diff line number Diff line change
@@ -42,6 +42,10 @@
},
"gettext-libintl"
]
},
"tools": {
"description": "Build tools",
"supports": "!emscripten"
}
}
}