Skip to content

Commit

Permalink
chore(deps): bump deps, cpm
Browse files Browse the repository at this point in the history
  • Loading branch information
Curve committed Jan 24, 2024
1 parent 9b442fd commit 256339f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.16)
project(rohrkabel LANGUAGES CXX VERSION 2.5)
cmake_minimum_required(VERSION 3.21)
project(rohrkabel LANGUAGES CXX VERSION 2.6)

# --------------------------------------------------------------------------------------------------------
# Library options
# --------------------------------------------------------------------------------------------------------

option(rohrkabel_examples "Build examples" OFF)
option(rohrkabel_prefer_remote "Prefer remote packages over local packages" ON)
option(rohrkabel_examples "Build examples" OFF)
option(rohrkabel_prefer_remote "Prefer remote packages over local packages" ON)

# --------------------------------------------------------------------------------------------------------
# Warning for non unix platforms
Expand Down Expand Up @@ -85,13 +85,13 @@ CPMFindPackage(

CPMFindPackage(
NAME ereignis
VERSION 2.2
VERSION 2.3
GIT_REPOSITORY "https://github.com/Curve/ereignis"
)

CPMFindPackage(
NAME boost_callable_traits
GIT_TAG 2a56a3a
GIT_TAG boost-1.84.0
GIT_REPOSITORY "https://github.com/boostorg/callable_traits"
)

Expand Down
11 changes: 10 additions & 1 deletion cmake/cpm.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if(NOT COMMAND cpm_message)
endfunction()
endif()

set(CURRENT_CPM_VERSION 0.38.5)
set(CURRENT_CPM_VERSION 0.38.7)

get_filename_component(CPM_CURRENT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
if(CPM_DIRECTORY)
Expand Down Expand Up @@ -99,6 +99,12 @@ macro(cpm_set_policies)
cmake_policy(SET CMP0135 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0135 NEW)
endif()

# treat relative git repository paths as being relative to the parent project's remote
if(POLICY CMP0150)
cmake_policy(SET CMP0150 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0150 NEW)
endif()
endmacro()
cpm_set_policies()

Expand Down Expand Up @@ -1095,12 +1101,15 @@ function(cpm_prettify_package_arguments OUT_VAR IS_IN_COMMENT)
DOWNLOAD_ONLY
GITHUB_REPOSITORY
GITLAB_REPOSITORY
BITBUCKET_REPOSITORY
GIT_REPOSITORY
SOURCE_DIR
FIND_PACKAGE_ARGUMENTS
NO_CACHE
SYSTEM
GIT_SHALLOW
EXCLUDE_FROM_ALL
SOURCE_SUBDIR
)
set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND)
cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
Expand Down

0 comments on commit 256339f

Please sign in to comment.