diff options
| author | Stephen Just <stephenjust@gmail.com> | 2021-01-10 23:59:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 23:59:25 -0800 |
| commit | 2aec96fc77e69cdcbb4c39352787e5bf93bf9645 (patch) | |
| tree | 48bdccd7d25a75bd45d2a9a89248b1eb8bf7a39b /ports/ktx/0002-Fix-versioning.patch | |
| parent | 7fee6a4756c8f276d63ebb84385c0be579817db7 (diff) | |
| download | vcpkg-2aec96fc77e69cdcbb4c39352787e5bf93bf9645.tar.gz vcpkg-2aec96fc77e69cdcbb4c39352787e5bf93bf9645.zip | |
[KTX] Add port (#15336)
* [KTX] Add port
* Apply formatting
* Install bash for windows
* Attempt to fix bash root and osx build since I can't repro either
* Fix windows build
* Disable on x86 which is not supported, use vcpkg-supplied zstd headers
* Fixes
* Fix cut/paste error
* Update based on review comments
Diffstat (limited to 'ports/ktx/0002-Fix-versioning.patch')
| -rw-r--r-- | ports/ktx/0002-Fix-versioning.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ports/ktx/0002-Fix-versioning.patch b/ports/ktx/0002-Fix-versioning.patch new file mode 100644 index 000000000..1e5098806 --- /dev/null +++ b/ports/ktx/0002-Fix-versioning.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/version.cmake b/cmake/version.cmake +index 4094df1a..3b2af3bb 100644 +--- a/cmake/version.cmake ++++ b/cmake/version.cmake +@@ -108,8 +108,10 @@ function(generate_version _var ) + set(${_var} "${KTX_VERSION}" PARENT_SCOPE) + endfunction() + +-# Get latest tag +-git_describe_raw(KTX_VERSION_FULL --abbrev=0 --match v[0-9]*) ++if (!KTX_VERSION_FULL) ++ # Get latest tag ++ git_describe_raw(KTX_VERSION_FULL --abbrev=0 --match v[0-9]*) ++endif() + #message("KTX full version: ${KTX_VERSION_FULL}") + + # generate_version(TOKTX_VERSION tools/toktx) |