Skip to content

Commit

Permalink
Bumped version for new release, added more versioning information.
Browse files Browse the repository at this point in the history
Also fixed the test config to avoid unnecessary coverage reporting.
  • Loading branch information
LTLA committed Jul 18, 2024
1 parent 55325ba commit b966b87
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
13 changes: 9 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.24)

project(kaori
VERSION 1.1.1
VERSION 1.1.2
DESCRIPTION "Header-only C++ library for screen counting"
LANGUAGES CXX)

Expand All @@ -11,6 +11,8 @@ add_library(kaori INTERFACE)
add_library(crisprverse::kaori ALIAS kaori)

include(GNUInstallDirs)
include(CMakePackageConfigHelpers)

target_include_directories(kaori INTERFACE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/crisprverse_kaori>")
Expand All @@ -19,7 +21,7 @@ option(KAORI_FETCH_EXTERN "Automatically fetch kaori's external dependencies." O
if(KAORI_FETCH_EXTERN)
add_subdirectory(extern)
else()
find_package(ltla_byteme CONFIG REQUIRED)
find_package(ltla_byteme 1.0.0 CONFIG REQUIRED)
endif()

target_link_libraries(kaori INTERFACE ltla::byteme)
Expand All @@ -39,8 +41,6 @@ if(KAORI_TESTS)
endif()

# Installing for find_package.
include(CMakePackageConfigHelpers)

install(DIRECTORY include/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/crisprverse_kaori)

Expand All @@ -56,5 +56,10 @@ configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/crisprverse_kaoriConfig.cmake"
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/crisprverse_kaori)

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

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/crisprverse_kaoriConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/crisprverse_kaoriConfigVersion.cmake"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/crisprverse_kaori)
2 changes: 1 addition & 1 deletion cmake/Config.cmake.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(ltla_byteme CONFIG REQUIRED)
find_dependency(ltla_byteme 1.0.0 CONFIG REQUIRED)

include("${CMAKE_CURRENT_LIST_DIR}/crisprverse_kaoriTargets.cmake")
2 changes: 1 addition & 1 deletion extern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include(FetchContent)
FetchContent_Declare(
byteme
GIT_REPOSITORY https://github.com/LTLA/byteme
GIT_TAG master
GIT_TAG master # ^1.0.0
)

FetchContent_MakeAvailable(byteme)

0 comments on commit b966b87

Please sign in to comment.