mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 05:30:26 +08:00
2aec96fc77
* [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
18 lines
561 B
Diff
18 lines
561 B
Diff
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)
|