Skip to content

Commit

Permalink
Bumped version for a new release.
Browse files Browse the repository at this point in the history
- Specify the minimum required versions for all dependencies.
- Configured our own version file for use by downstream libraries.
  • Loading branch information
LTLA committed May 22, 2024
1 parent 2209cac commit b0dbc58
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.24)

project(tatami_r
VERSION 1.0.0
VERSION 2.0.0
DESCRIPTION "tatami bindings for abstract R matrices"
LANGUAGES CXX)

Expand All @@ -14,8 +14,9 @@ option(TATAMI_R_FETCH_EXTERN "Automatically fetch tatami_r's external dependenci
if(TATAMI_R_FETCH_EXTERN)
add_subdirectory(extern)
else()
find_package(tatami_tatami CONFIG REQUIRED)
find_package(tatami_manticore CONFIG REQUIRED)
find_package(tatami_tatami 3.0.0 CONFIG REQUIRED)
find_package(tatami_tatami_chunked 2.0.0 CONFIG REQUIRED)
find_package(tatami_manticore 1.0.0 CONFIG REQUIRED)
endif()

target_link_libraries(tatami_r INTERFACE tatami::tatami tatami::tatami_chunked tatami::manticore)
Expand Down Expand Up @@ -47,5 +48,10 @@ configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/tatami_tatami_rConfig.cmake"
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tatami_tatami_r)

write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/tatami_tatami_rConfigVersion.cmake
COMPATIBILITY SameMajorVersion)

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tatami_tatami_rConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/tatami_tatami_rConfigVersion.cmake"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tatami_tatami_r)
6 changes: 3 additions & 3 deletions cmake/Config.cmake.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(tatami_tatami CONFIG REQUIRED)
find_dependency(tatami_tatami_chunked CONFIG REQUIRED)
find_dependency(tatami_manticore CONFIG REQUIRED)
find_dependency(tatami_tatami 3.0.0 CONFIG REQUIRED)
find_dependency(tatami_tatami_chunked 2.0.0 CONFIG REQUIRED)
find_dependency(tatami_manticore 1.0.0 CONFIG REQUIRED)

include("${CMAKE_CURRENT_LIST_DIR}/tatami_tatami_rTargets.cmake")
6 changes: 3 additions & 3 deletions extern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ include(FetchContent)
FetchContent_Declare(
tatami
GIT_REPOSITORY https://github.com/tatami-inc/tatami
GIT_TAG master
GIT_TAG master # ^v3.0.0
)

FetchContent_Declare(
tatami_chunked
GIT_REPOSITORY https://github.com/tatami-inc/tatami_chunked
GIT_TAG master
GIT_TAG master # ^v2.0.0
)

FetchContent_Declare(
manticore
GIT_REPOSITORY https://github.com/tatami-inc/manticore
GIT_TAG master
GIT_TAG master # ^v1.0.0
)

FetchContent_MakeAvailable(manticore)
Expand Down

0 comments on commit b0dbc58

Please sign in to comment.