dev #3

Merged
chizeta merged 9 commits from dev into main 2024-02-04 00:49:58 +01:00
Showing only changes of commit 1261435835 - Show all commits

View file

@ -1,11 +1,13 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.5)
project(cnorxz) project(cnorxz)
# LIB VERSION # LIB VERSION
set(VERSION_PART "pre") set(V_MAJOR 0)
set(VERSION_TAG_HASH "6857e3fc7d0af25db3a925791d1cabc6342b930a") set(V_MINOR 0)
set(V_PATCH 0)
set(VERSION "${V_MAJOR}.${V_MINOR}.${V_PATCH}")
# OPTIONS # OPTIONS
@ -20,22 +22,14 @@ include(cmake/check_avx.cmake)
execute_process(COMMAND bash "-c" "git rev-parse HEAD" OUTPUT_VARIABLE GIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND bash "-c" "git rev-parse HEAD" OUTPUT_VARIABLE GIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND bash "-c" "git rev-parse --abbrev-ref HEAD" OUTPUT_VARIABLE GIT_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND bash "-c" "git rev-parse --abbrev-ref HEAD" OUTPUT_VARIABLE GIT_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE)
# BUILD / CHECK VERSION STRING # BUILD VERSION STRING
message(STATUS "${GIT_HASH}") message(STATUS "git hash = ${GIT_HASH}")
message(STATUS "${VERSION_PART}") message(STATUS "git branch = ${GIT_BRANCH}")
message(STATUS "${VERSION_TAG_HASH}")
set(VERSION "${VERSION_PART}")
if(NOT ("${GIT_BRANCH}" EQUAL "release")) if(NOT ("${GIT_BRANCH}" EQUAL "release"))
if(NOT ("${GIT_HASH}" EQUAL "${VERSION_TAG_HASH}"))
string(SUBSTRING ${GIT_HASH} 0 7 GIT_HASH_SHORT) string(SUBSTRING ${GIT_HASH} 0 7 GIT_HASH_SHORT)
set(VERSION "${VERSION}-${GIT_BRANCH}-${GIT_HASH_SHORT}") set(VERSION "${VERSION}-${GIT_BRANCH}-${GIT_HASH_SHORT}")
endif() endif()
else()
if(NOT ("${GIT_HASH}" EQUAL "${VERSION_TAG_HASH}"))
message(FATAL_ERROR "version mash-up, do not use, contact maintainer")
endif()
endif()
message(STATUS "version = ${VERSION}") message(STATUS "version = ${VERSION}")
# CHECK COMPILER # CHECK COMPILER