Skip to content

Commit

Permalink
Bump version: 1.81.0-rc4 -> 1.81.0-rc5
Browse files Browse the repository at this point in the history
  • Loading branch information
ClausKlein committed Dec 27, 2023
1 parent e023d9a commit 4529d85
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ message = Bump version: {current_version} -> {new_version}
tag_message = Release v{new_version}
tag_name = v{new_version}
tag = True
current_version = 1.81.0-rc4
current_version = 1.81.0-rc5
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)([-](?P<release>(dev|rc))+(?P<build>\d+))?
serialize =
{major}.{minor}.{patch}-{release}{build}
Expand Down
35 changes: 19 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.21...3.28)

project(Boost-CMake LANGUAGES C CXX VERSION 1.81.0.4)
project(Boost-CMake LANGUAGES C CXX VERSION 1.81.0.5)

if(PROJECT_IS_TOP_LEVEL)
message(STATUS "PROJECT_IS_TOP_LEVEL")
Expand Down Expand Up @@ -115,7 +115,7 @@ set(BOOST_LIBS_REQUIRED header)
if(PROJECT_IS_TOP_LEVEL)
# Compiled libs without warnings OSX with clang v17.0.6
list(APPEND
BOOST_LIBS_REQUIRED
BOOST_INCLUDE_LIBRARIES
atomic
chrono
exception
Expand Down Expand Up @@ -165,15 +165,6 @@ foreach(lib IN LISTS BOOST_LIBS_REQUIRED)
include("libs/${lib}.cmake")
endforeach()

if(BOOST_INCLUDE_LIBRARIES)
foreach(lib IN LISTS BOOST_INCLUDE_LIBRARIES)
# In case only a subset of modules is available
if(EXISTS "${BOOST_SOURCE}/libs/${lib}")
include("libs/${lib}.cmake")
endif()
endforeach()
endif()

#############################################################
# TODO(CK): Move this to libs/header.cmake in the right file
find_package(Threads)
Expand All @@ -189,12 +180,23 @@ target_compile_definitions(
)
target_link_libraries(boost INTERFACE Threads::Threads)
target_compile_definitions(boost INTERFACE BOOST_BIND_GLOBAL_PLACEHOLDERS)

if(NOT TARGET Boost::asio)
add_library(Boost::asio ALIAS boost)
endif()
add_library(Boost::boost ALIAS boost)
#############################################################

list(APPEND BOOST_INCLUDE_LIBRARIES asio)
list(APPEND BOOST_INCLUDE_LIBRARIES headers)
list(REMOVE_DUPLICATES BOOST_INCLUDE_LIBRARIES)

foreach(lib IN LISTS BOOST_INCLUDE_LIBRARIES)
# In case only a subset of modules is available
if(EXISTS "${BOOST_SOURCE}/libs/${lib}" AND EXISTS "libs/${lib}.cmake")
include("libs/${lib}.cmake")
else()
add_library(${lib} INTERFACE)
target_link_libraries(${lib} INTERFACE Boost::boost)
endif()
endforeach()

if(UNIX)
# TODO(CK): too many deprecated warnings!
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
Expand Down Expand Up @@ -242,12 +244,13 @@ if(BOOST_USE_ORIGINAL_PackageProject)
else()
list(REMOVE_ITEM BOOST_LIBS locale)
endif()

list(REMOVE_DUPLICATES BOOST_LIBS)
install(TARGETS ${BOOST_LIBS} EXPORT boostTargets)
else()
include(cmake/PackageProject.cmake)

set(BOOST_LIBS ${BOOST_INCLUDE_LIBRARIES})
list(REMOVE_ITEM BOOST_LIBS headers)
list(APPEND BOOST_LIBS boost)
endif()

Expand Down
7 changes: 0 additions & 7 deletions cmake/Config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,3 @@ foreach(dependency ${SEPARATE_DEPENDENCIES})
endforeach()

include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")

if(NOT TARGET @PROJECT_NAMESPACE@headers)
add_library(@PROJECT_NAMESPACE@headers ALIAS @PROJECT_NAMESPACE@boost)
endif()
if(NOT TARGET @PROJECT_NAMESPACE@asio)
add_library(@PROJECT_NAMESPACE@asio ALIAS @PROJECT_NAMESPACE@boost)
endif()
4 changes: 4 additions & 0 deletions cmake/PackageProject.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ function(packageProject)
set(PROJECT_VERSION_SUFFIX -${PROJECT_VERSION})
endif()

if(NOT PROJECT_TARGETS)
set(PROJECT_TARGETS ${PROJECT_NAME})
endif()

if(NOT DEFINED PROJECT_COMPATIBILITY)
set(PROJECT_COMPATIBILITY AnyNewerVersion)
endif()
Expand Down

0 comments on commit 4529d85

Please sign in to comment.