etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-24 04:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmake: Slightly redesign version string generation

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-04-22 22:49:09 +02:00 committed by Michael Fabian Dirks
parent 4f789a0214
commit c93789f6dc
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
CMakeLists.txt
View file

@ -24,7 +24,6 @@ set(VERSION_MINOR 8)
set(VERSION_PATCH 0)
set(VERSION_TWEAK 0)
set(VERSION_SUFFIX "b1")
set(PROJECT_COMMIT "N/A")
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
set(GIT_RESULT "")
set(GIT_OUTPUT "")
@ -49,6 +48,11 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
set(PROJECT_COMMIT ${GIT_OUTPUT})
endif()
endif()
if(PROJECT_COMMIT)
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}${VERSION_SUFFIX}-${PROJECT_COMMIT}")
else()
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}${VERSION_SUFFIX}")
endif()
# Policies
cmake_policy(PUSH)
@ -255,7 +259,7 @@ configure_file(
# Packaging
if("${CMAKE_PACKAGE_SUFFIX_OVERRIDE}" STREQUAL "")
set(_PACKAGE_SUFFIX_OVERRIDE "${PROJECT_VERSION}${VERSION_SUFFIX}-${PROJECT_COMMIT}")
set(_PACKAGE_SUFFIX_OVERRIDE "${VERSION_STRING}")
else()
set(_PACKAGE_SUFFIX_OVERRIDE "${CMAKE_PACKAGE_SUFFIX_OVERRIDE}")
endif()
@ -423,18 +427,12 @@ list(APPEND PROJECT_TEMPLATES
"cmake/version.hpp.in"
"cmake/module.cpp.in"
)
if(WIN32)
list(APPEND PROJECT_TEMPLATES
"cmake/installer.iss.in"
"cmake/version.rc.in"
)
endif()
list(APPEND PROJECT_PRIVATE_SOURCE
# Plugin
"source/common.hpp"
"source/strings.hpp"
"source/plugin.hpp"
"source/plugin.cpp"
"source/strings.hpp"
"source/utility.hpp"
"source/utility.cpp"
"source/util-event.hpp"
@ -488,6 +486,14 @@ list(APPEND PROJECT_PRIVATE_GENERATED
"${PROJECT_BINARY_DIR}/source/module.cpp"
"${PROJECT_BINARY_DIR}/source/version.hpp"
)
if(WIN32)
list(APPEND PROJECT_TEMPLATES
"cmake/installer.iss.in"
"cmake/version.rc.in"
)
list(APPEND PROJECT_PRIVATE_SOURCE
)
endif()
## OBS Studio - Frontend/Qt
if(HAVE_OBS_FRONTEND)
@ -496,7 +502,7 @@ if(HAVE_OBS_FRONTEND)
list(APPEND PROJECT_PRIVATE_SOURCE
)
list(APPEND PROJECT_INCLUDE_DIRS
"ui"
"source/ui"
)
list(APPEND PROJECT_DEFINITIONS
ENABLE_FRONTEND
@ -943,8 +949,9 @@ if(HAVE_OBS_FRONTEND)
AUTOUIC TRUE
AUTOUIC_SEARCH_PATHS "${PROJECT_SOURCE_DIR};${PROJECT_SOURCE_DIR}/ui"
AUTOMOC TRUE
AUTOGEN_BUILD_DIR "${PROJECT_BINARY_DIR}/source"
AUTORCC TRUE
AUTOGEN_BUILD_DIR "${PROJECT_BINARY_DIR}/source"
AUTOGEN_SOURCE_GROUP "Qt Files"
)
endif()

5
cmake/version.hpp.in
View file

@ -23,6 +23,7 @@
#define STREAMFX_MAKE_VERSION(major,minor,patch,tweak) ((uint64_t(major) & 0xFFFFull) << 48ull) | ((uint64_t(minor) & 0xFFFFull) << 32ull) | ((uint64_t(patch) & 0xFFFFull) << 16ull) | ((uint64_t(tweak) & 0xFFFFull))
#define STREAMFX_MASK_MAJOR 0xFFFF000000000000ull
#define STREAMFX_MASK_COMPAT 0xFFFFFFFF00000000ull
#define STREAMFX_MASK_UPDATE 0xFFFFFFFFFFFF0000ull
@ -31,5 +32,7 @@
#define STREAMFX_VERSION_MINOR @PROJECT_VERSION_MINOR@
#define STREAMFX_VERSION_PATCH @PROJECT_VERSION_PATCH@
#define STREAMFX_VERSION_BUILD @PROJECT_VERSION_TWEAK@
#define STREAMFX_VERSION_TWEAK @PROJECT_VERSION_TWEAK@
#define STREAMFX_VERSION_SUFFIX @VERSION_SUFFIX@
#define STREAMFX_VERSION STREAMFX_MAKE_VERSION(STREAMFX_VERSION_MAJOR, STREAMFX_VERSION_MINOR, STREAMFX_VERSION_PATCH, STREAMFX_VERSION_BUILD)
#define STREAMFX_VERSION_STRING "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.@PROJECT_VERSION_TWEAK@-@PROJECT_COMMIT@"
#define STREAMFX_VERSION_STRING "@VERSION_STRING@"