Skip to content

Commit

Permalink
[ktx] no vendored libs (microsoft#36508)
Browse files Browse the repository at this point in the history
  • Loading branch information
autoantwort authored Feb 8, 2024
1 parent da78c7e commit 3f806e0
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 2 deletions.
17 changes: 17 additions & 0 deletions ports/ktx/0005-no-vendored-libs.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7ca937..ffcbe95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1059,10 +1059,10 @@ endif()
# except for building the ktx library.
if((KTX_FEATURE_TOOLS OR KTX_FEATURE_TESTS) AND NOT TARGET fmt::fmt)
set(FMT_SYSTEM_HEADERS ON)
- add_subdirectory(other_projects/fmt)
+ find_package(fmt CONFIG REQUIRED)
endif()
if(KTX_FEATURE_TOOLS AND NOT TARGET cxxopts::cxxopts)
- add_subdirectory(other_projects/cxxopts)
+ find_package(cxxopts CONFIG REQUIRED)
endif()

# Tools
1 change: 1 addition & 0 deletions ports/ktx/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ vcpkg_from_github(
0002-Fix-versioning.patch
0003-mkversion.patch
0004-quirks.patch
0005-no-vendored-libs.patch
)
file(REMOVE "${SOURCE_PATH}/other_include/zstd_errors.h")

Expand Down
7 changes: 6 additions & 1 deletion ports/ktx/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "ktx",
"version-semver": "4.3.0-beta1",
"port-version": 1,
"description": [
"The Khronos KTX library and tools.",
"Functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them."
Expand All @@ -22,7 +23,11 @@
"features": {
"tools": {
"description": "Build tools",
"supports": "!android"
"supports": "!android",
"dependencies": [
"cxxopts",
"fmt"
]
},
"vulkan": {
"description": "Build Vulkan support",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3994,7 +3994,7 @@
},
"ktx": {
"baseline": "4.3.0-beta1",
"port-version": 0
"port-version": 1
},
"kubazip": {
"baseline": "0.2.6",
Expand Down
5 changes: 5 additions & 0 deletions versions/k-/ktx.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7db3fff00913b362bd7ac3c0a3611209f5d038df",
"version-semver": "4.3.0-beta1",
"port-version": 1
},
{
"git-tree": "e5d9ea81aabca83f512d64a46fd545d353552034",
"version-semver": "4.3.0-beta1",
Expand Down

0 comments on commit 3f806e0

Please sign in to comment.