Skip to content

Commit

Permalink
Remove mandatory dependency to Doxygen. Fix a warning. prepare v1.5.5.
Browse files Browse the repository at this point in the history
  • Loading branch information
ptal committed Dec 26, 2024
1 parent b651bab commit 62233bb
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ include(FetchContent)
FetchContent_Declare(
googletest
GIT_REPOSITORY "https://github.com/google/googletest"
GIT_TAG v1.14.0
GIT_TAG v1.15.2
GIT_SHALLOW 1
)
# For Windows: Prevent overriding the parent project's compiler/linker settings
Expand Down Expand Up @@ -92,6 +92,9 @@ endif()

# Documentation

option(CUDA_BATTERY_BUILD_DOC "Build documentation" OFF)
if(CUDA_BATTERY_BUILD_DOC)

find_package(Doxygen REQUIRED doxygen)

set(DOXYGEN_PROJECT_NAME "Cuda battery library")
Expand Down Expand Up @@ -122,3 +125,5 @@ doxygen_add_docs(doc_cuda_battery
"include/"
ALL
COMMENT "Generate HTML documentation")

endif()
21 changes: 21 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@
}
}
},
{
"name": "doc",
"hidden": true,
"inherits": "default",
"cacheVariables": {
"CUDA_BATTERY_BUILD_DOC": {
"type": "BOOL",
"value": "ON"
}
}
},
{
"name": "debug",
"hidden": true,
Expand Down Expand Up @@ -75,6 +86,16 @@
"description": "Build the project with CUDA NVCC compiler.",
"inherits": ["default-gpu","release"]
},
{
"name": "gpu-doc",
"displayName": "GPU Release configuration",
"description": "Build the project and documentation with CUDA NVCC compiler.",
"inherits": [
"default-gpu",
"release",
"doc"
]
},
{
"name": "cpu-debug",
"displayName": "CPU Debug configuration",
Expand Down
2 changes: 1 addition & 1 deletion include/battery/allocator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ class pool_allocator {
control_block* block;

public:
CUDA NI pool_allocator() = default;
NI pool_allocator() = default;

CUDA NI pool_allocator(const pool_allocator& other):
block(other.block)
Expand Down

0 comments on commit 62233bb

Please sign in to comment.