From e293fe0ad0649b7a19f35473eceaa6dbed7e0fa9 Mon Sep 17 00:00:00 2001
From: tmp64 <tmp32x2@gmail.com>
Date: Mon, 22 Jun 2020 11:39:04 +0700
Subject: [PATCH] AppVeyor: Fix incorrect branch in version string

---
 CMakeLists.txt | 8 +++++++-
 appveyor.yml   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b38e3dd9..68a6bc70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,7 +251,13 @@ set( BHL_VERSION_STRING "${BHL_VERSION_MAJOR}.${BHL_VERSION_MINOR}.${BHL_VERSION
 if( BHL_VERSION_TAG )
 	set( BHL_VERSION_STRING "${BHL_VERSION_STRING}-${BHL_VERSION_TAG}" )
 endif()
-set( BHL_VERSION_STRING "${BHL_VERSION_STRING}+${GIT_BRANCH}.${GIT_COMMIT_HASH}" )
+
+if( BHL_FORCE_BRANCH )
+	set( BHL_VERSION_STRING "${BHL_VERSION_STRING}+${BHL_FORCE_BRANCH}.${GIT_COMMIT_HASH}" )
+else()
+	set( BHL_VERSION_STRING "${BHL_VERSION_STRING}+${GIT_BRANCH}.${GIT_COMMIT_HASH}" )
+endif()
+
 if( GIT_DIRTY )
 	set( BHL_VERSION_STRING "${BHL_VERSION_STRING}.m" )
 endif()
diff --git a/appveyor.yml b/appveyor.yml
index 130fed9f..594cb781 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,7 +31,7 @@ install:
   - cmd: git submodule update --init --recursive
 
 build_script:
-  - ps: ./scripts/BuildRelease.ps1 -Target $env:TARGET -MakeZip -CMakeArgs "-DBHL_VERSION_METADATA=`"appveyor.${env:APPVEYOR_REPO_BRANCH}.${env:APPVEYOR_BUILD_NUMBER}`"" -Updater
+  - ps: ./scripts/BuildRelease.ps1 -Target $env:TARGET -MakeZip -CMakeArgs "-DBHL_FORCE_BRANCH=`"${env:APPVEYOR_REPO_BRANCH}`"" -Updater
 
 artifacts:
   - path: autobuild/BugfixedHL-*.zip