Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake,mk: bump the tentative next release with pre-release identifier #546

Merged
merged 1 commit into from
Sep 28, 2022
Merged

cmake,mk: bump the tentative next release with pre-release identifier #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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")

Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions cmake/re-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down