Skip to content

Commit a5c3e35

Browse files
committed
Merged
2 parents 5b6aeea + f8bf2d5 commit a5c3e35

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ cmake_minimum_required(VERSION 3.20)
33
# Project declaration - cpp_library_setup will use this name and detect version from git tags
44
project(stlab-enum-ops)
55

6-
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm CACHE PATH "CPM cache")
6+
# Setup cpp-library infrastructure
7+
if(PROJECT_IS_TOP_LEVEL)
8+
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm CACHE PATH "CPM cache")
9+
endif()
710
include(cmake/CPM.cmake)
811

912
# Fetch cpp-library via CPM
@@ -14,7 +17,8 @@ include(cmake/CPM.cmake)
1417
# URL "${CMAKE_SOURCE_DIR}/../cpp-library"
1518
# )
1619
CPMAddPackage("gh:stlab/cpp-library#3ab13f2be3b835fd1e6feaab7845088c31642eba")
17-
# CPMAddPackage("gh:stlab/cpp-library@4.0.3")
20+
# CPMAddPackage("gh:stlab/cpp-library@4.0.5")
21+
1822
include(${cpp-library_SOURCE_DIR}/cpp-library.cmake)
1923

2024
# Let cpp-library handle the project declaration and version detection

include/stlab/enum_ops.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ auto stlab_enable_bitmask_enum(...) -> std::false_type;
134134
/// arithmetic operators.
135135
auto stlab_enable_arithmetic_enum(...) -> std::false_type;
136136

137-
// Don't use the `\ deprecated` Doxygen tag here because clang will warn that the
137+
// Don't use the `\deprecated` Doxygen tag here because clang will warn that the
138138
// documentation marks the operations deprecated but the deprecated attribute is missing.
139139

140140
/// \note Use is **deprecated**. Use stlab_enable_bitmask_enum instead.

0 commit comments

Comments
 (0)