Use built-in ${VERSION_*} variables

xmake-io · Oct 20, 2024 · 7372b07 · 7372b07
1 parent d6604fb
commit 7372b07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/packages/z/zbar/port/config.h.in b/packages/z/zbar/port/config.h.in
@@ -392,13 +392,13 @@
 #undef X_DISPLAY_MISSING
 
 /* Program major version (before the '.') as a number */
-#undef ZBAR_VERSION_MAJOR
+#define ZBAR_VERSION_MAJOR ${VERSION_MAJOR}
 
 /* Program minor version (after '.') as a number */
-#undef ZBAR_VERSION_MINOR
+#define ZBAR_VERSION_MINOR ${VERSION_MINOR}
 
 /* Program patch version (after the second '.') as a number */
-#undef ZBAR_VERSION_PATCH
+#define ZBAR_VERSION_PATCH ${VERSION_ALTER}
 
 /* Define to 1 if necessary to make fseeko visible. */
 #undef _LARGEFILE_SOURCE

diff --git a/packages/z/zbar/port/xmake.lua b/packages/z/zbar/port/xmake.lua
@@ -14,17 +14,8 @@ option_end()
 if has_config("vers") then
     set_version(get_config("vers"))
 
-    set_configvar("VERSION", get_config("vers"))
     set_configvar("PACKAGE_VERSION", get_config("vers"))
     set_configvar("PACKAGE_STRING", "zbar " .. get_config("vers"))
-
-    local vers = get_config("vers"):split("%.")
-    major_ver = vers[1] or ""
-    minor_ver = vers[2] or ""
-    patch_ver = vers[3] or ""
-    set_configvar("ZBAR_VERSION_MAJOR", major_ver, {quote = false})
-    set_configvar("ZBAR_VERSION_MINOR", minor_ver, {quote = false})
-    set_configvar("ZBAR_VERSION_PATCH", patch_ver, {quote = false})
 end
 
 option("LIB_VERSION")