From 81a0c47ad1f34c85bac9aee76656a46eaf59c2f0 Mon Sep 17 00:00:00 2001
From: Sebastian Reimers <hallo@studio-link.de>
Date: Wed, 28 Sep 2022 07:49:16 +0200
Subject: [PATCH] cmake,mk: bump the tentative next release with pre-release
 identifier

---
 CMakeLists.txt        | 16 ++++++++++++++--
 Makefile              |  4 ++--
 cmake/re-config.cmake |  8 ++------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 886164d9d..fcd440115 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,12 +13,16 @@
 cmake_minimum_required(VERSION 3.10)
 
 project(re
-  VERSION 2.7.0
+  VERSION 2.8.0
   LANGUAGES C
   HOMEPAGE_URL https://github.com/baresip/re
   DESCRIPTION "Generic library for real-time communications"
 )
 
+# Pre-release identifier, comment out on a release
+# Increment for breaking changes (dev2, dev3...)
+set(PROJECT_VERSION_FULL ${PROJECT_VERSION}-dev)
+
 set(PROJECT_SOVERSION 9) # bump if ABI breaks
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
@@ -76,6 +80,14 @@ endif()
 
 set(re_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake)
 find_package(re CONFIG REQUIRED)
+
+list(APPEND RE_DEFINITIONS
+  -DVERSION="${PROJECT_VERSION_FULL}"
+  -DVER_MAJOR=${PROJECT_VERSION_MAJOR}
+  -DVER_MINOR=${PROJECT_VERSION_MINOR}
+  -DVER_PATCH=${PROJECT_VERSION_PATCH}
+)
+
 ##############################################################################
 #
 # Source/Header section
@@ -547,7 +559,7 @@ target_include_directories(re-objs PRIVATE include ${OPENSSL_INCLUDE_DIR})
 
 add_library(re-shared SHARED $<TARGET_OBJECTS:re-objs>)
 target_link_libraries(re-shared PRIVATE ${LINKLIBS})
-set_target_properties(re-shared PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(re-shared PROPERTIES VERSION ${PROJECT_VERSION_FULL})
 set_target_properties(re-shared PROPERTIES SOVERSION ${PROJECT_SOVERSION})
 set_target_properties(re-shared PROPERTIES OUTPUT_NAME "re")
 
diff --git a/Makefile b/Makefile
index e18746d2e..9861fd417 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@
 
 # Main version number
 VER_MAJOR := 2
-VER_MINOR := 7
+VER_MINOR := 8
 VER_PATCH := 0
 
 # Development version, comment out on a release
 # Increment for breaking changes (dev2, dev3...)
-# VER_PRE   := dev
+VER_PRE   := dev
 
 # bump Major if ABI breaks
 ABI_MAJOR := 9
diff --git a/cmake/re-config.cmake b/cmake/re-config.cmake
index 5097c5bee..ee9eaa81c 100644
--- a/cmake/re-config.cmake
+++ b/cmake/re-config.cmake
@@ -48,7 +48,7 @@ if(CMAKE_USE_PTHREADS_INIT)
   set(HAVE_PTHREAD ON)
 endif()
 
-list(APPEND RE_DEFINITIONS 
+list(APPEND RE_DEFINITIONS
   -DHAVE_ATOMIC
   -DHAVE_INET6
   -DHAVE_SELECT
@@ -112,13 +112,9 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 endif()
 
 
-list(APPEND RE_DEFINITIONS 
+list(APPEND RE_DEFINITIONS
   -DARCH="${CMAKE_SYSTEM_PROCESSOR}"
   -DOS="${CMAKE_SYSTEM_NAME}"
-  -DVERSION="${PROJECT_VERSION}"
-  -DVER_MAJOR=${PROJECT_VERSION_MAJOR}
-  -DVER_MINOR=${PROJECT_VERSION_MINOR}
-  -DVER_PATCH=${PROJECT_VERSION_PATCH}
 )
 
 if(${CMAKE_BUILD_TYPE} MATCHES "[Rr]el")