Fixed build

deathkiller · Nov 26, 2024 · d8a2e35 · d8a2e35
1 parent a6a8b83
commit d8a2e35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.7)
 project(nCine-Android-${ANDROID_ABI})
 
 # Check if we can use IFUNC for CPU dispatch. This part is already in `ncine_options.cmake`, but we need to check it also against Android NDK toolchain.

diff --git a/cmake/ncine_get_version.cmake b/cmake/ncine_get_version.cmake
@@ -99,7 +99,8 @@ if(NCINE_VERSION_FROM_GIT)
 				# The head ref or source branch of the pull request in a workflow run on GitHub
 				set(_pullRequestHeadRef "$ENV{GITHUB_HEAD_REF}")
 				if(_pullRequestHeadRef AND NOT ${_pullRequestHeadRef} STREQUAL "master" AND NOT ${_pullRequestHeadRef} STREQUAL "main")
-					set(NCINE_VERSION_PATCH "${NCINE_VERSION_PATCH}|${_pullRequestHeadRef}")
+					string(REPLACE "/" "_" _pullRequestHeadRef ${_pullRequestHeadRef})
+					set(NCINE_VERSION_PATCH "${NCINE_VERSION_PATCH}-${_pullRequestHeadRef}")
 				endif()
 			else()
 				# The last commit is tagged, use it as version