Skip to content

Commit d01f7ea

Browse files
patrickrobertspatrickroberts
committed
Formatted CMake and Markdown
1 parent ba321f0 commit d01f7ea

File tree

3 files changed

+97
-74
lines changed

3 files changed

+97
-74
lines changed

‎CMakeLists.txt‎

Lines changed: 88 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
cmake_minimum_required(VERSION 3.25)
44

55
project(
6-
beman.any_view
7-
DESCRIPTION "A generalized type-erased view with customizable properties"
8-
LANGUAGES CXX)
6+
beman.any_view
7+
DESCRIPTION "A generalized type-erased view with customizable properties"
8+
LANGUAGES CXX
9+
)
910

1011
# [CMAKE.SKIP_TESTS]
1112
option(
12-
BEMAN_ANY_VIEW_BUILD_TESTS
13-
"Enable building tests and test infrastructure. Default: ON. Values: { ON, OFF }."
14-
${PROJECT_IS_TOP_LEVEL})
13+
BEMAN_ANY_VIEW_BUILD_TESTS
14+
"Enable building tests and test infrastructure. Default: ON. Values: { ON, OFF }."
15+
${PROJECT_IS_TOP_LEVEL}
16+
)
1517

1618
# [CPP.NO_FLAG_FORKING]
1719
set(BEMAN_ANY_VIEW_DESIGN
1820
"FLAGS"
19-
CACHE
20-
STRING
21-
"Enable alternative design for any_view_options. Default: FLAGS. Values: { FLAGS, TRAITS, NAMED }."
21+
CACHE STRING
22+
"Enable alternative design for any_view_options. Default: FLAGS. Values: { FLAGS, TRAITS, NAMED }."
2223
)
2324

2425
set(BEMAN_ANY_VIEW_OPTION
2526
"COPYABLE"
26-
CACHE
27-
STRING
28-
"Enable opt-in option for any_view. Default: COPYABLE. Values: { COPYABLE, MOVE_ONLY }."
27+
CACHE STRING
28+
"Enable opt-in option for any_view. Default: COPYABLE. Values: { COPYABLE, MOVE_ONLY }."
2929
)
3030

3131
set(BEMAN_ANY_VIEW_USE_FLAGS OFF)
@@ -35,33 +35,36 @@ set(BEMAN_ANY_VIEW_USE_COPYABLE OFF)
3535
set(BEMAN_ANY_VIEW_USE_MOVE_ONLY OFF)
3636

3737
if(BEMAN_ANY_VIEW_DESIGN STREQUAL "FLAGS")
38-
set(BEMAN_ANY_VIEW_USE_FLAGS ON)
38+
set(BEMAN_ANY_VIEW_USE_FLAGS ON)
3939
elseif(BEMAN_ANY_VIEW_DESIGN STREQUAL "TRAITS")
40-
set(BEMAN_ANY_VIEW_USE_TRAITS ON)
40+
set(BEMAN_ANY_VIEW_USE_TRAITS ON)
4141
elseif(BEMAN_ANY_VIEW_DESIGN STREQUAL "NAMED")
42-
set(BEMAN_ANY_VIEW_USE_NAMED ON)
42+
set(BEMAN_ANY_VIEW_USE_NAMED ON)
4343
else()
44-
message(
45-
FATAL_ERROR
46-
"BEMAN_ANY_VIEW_DESIGN must be one of { FLAGS, TRAITS, NAMED }; got ${BEMAN_ANY_VIEW_DESIGN}"
47-
)
44+
message(
45+
FATAL_ERROR
46+
"BEMAN_ANY_VIEW_DESIGN must be one of { FLAGS, TRAITS, NAMED }; got ${BEMAN_ANY_VIEW_DESIGN}"
47+
)
4848
endif()
4949

5050
if(BEMAN_ANY_VIEW_OPTION STREQUAL "COPYABLE")
51-
set(BEMAN_ANY_VIEW_USE_COPYABLE ON)
51+
set(BEMAN_ANY_VIEW_USE_COPYABLE ON)
5252
elseif(BEMAN_ANY_VIEW_OPTION STREQUAL "MOVE_ONLY")
53-
set(BEMAN_ANY_VIEW_USE_MOVE_ONLY ON)
53+
set(BEMAN_ANY_VIEW_USE_MOVE_ONLY ON)
5454
else()
55-
message(
56-
FATAL_ERROR
57-
"BEMAN_ANY_VIEW_OPTION must be one of { COPYABLE, MOVE_ONLY }; got ${BEMAN_ANY_VIEW_OPTION}"
58-
)
55+
message(
56+
FATAL_ERROR
57+
"BEMAN_ANY_VIEW_OPTION must be one of { COPYABLE, MOVE_ONLY }; got ${BEMAN_ANY_VIEW_OPTION}"
58+
)
5959
endif()
6060

6161
string(TOLOWER "${BEMAN_ANY_VIEW_OPTION}" BEMAN_ANY_VIEW_OPTION)
6262

63-
configure_file("${PROJECT_SOURCE_DIR}/include/beman/any_view/config.hpp.in"
64-
"${PROJECT_BINARY_DIR}/include/beman/any_view/config.hpp" @ONLY)
63+
configure_file(
64+
"${PROJECT_SOURCE_DIR}/include/beman/any_view/config.hpp.in"
65+
"${PROJECT_BINARY_DIR}/include/beman/any_view/config.hpp"
66+
@ONLY
67+
)
6568

6669
include(FetchContent)
6770
include(GNUInstallDirs)
@@ -70,56 +73,72 @@ add_library(beman.any_view INTERFACE)
7073
add_library(beman::any_view ALIAS beman.any_view)
7174
# TODO: implement non-template friend function and remove this suppression
7275
target_compile_options(
73-
beman.any_view INTERFACE $<$<CXX_COMPILER_ID:GNU>:-Wno-non-template-friend>)
76+
beman.any_view
77+
INTERFACE $<$<CXX_COMPILER_ID:GNU>:-Wno-non-template-friend>
78+
)
7479
target_include_directories(
75-
beman.any_view
76-
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
77-
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
78-
$<INSTALL_INTERFACE:include>)
80+
beman.any_view
81+
INTERFACE
82+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
83+
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
84+
$<INSTALL_INTERFACE:include>
85+
)
7986

8087
install(
81-
TARGETS beman.any_view
82-
EXPORT ${TARGETS_EXPORT_NAME}
83-
DESTINATION $<$<CONFIG:Debug>:debug/>${CMAKE_INSTALL_LIBDIR})
88+
TARGETS beman.any_view
89+
EXPORT ${TARGETS_EXPORT_NAME}
90+
DESTINATION
91+
$<$<CONFIG:Debug>:debug/>${CMAKE_INSTALL_LIBDIR}
92+
)
8493

8594
install(
86-
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
87-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}
88-
FILES_MATCHING
89-
PATTERN "${CMAKE_CURRENT_SOURCE_DIR}/include/beman/any_view/*.hpp")
95+
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
96+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}
97+
FILES_MATCHING
98+
PATTERN "${CMAKE_CURRENT_SOURCE_DIR}/include/beman/any_view/*.hpp"
99+
)
90100

91101
macro(beman_add_executable)
92-
set(options)
93-
set(oneValueArgs CATEGORY TARGET)
94-
set(multiValueArgs SOURCES LIBRARIES)
95-
96-
cmake_parse_arguments(beman_executable "${options}" "${oneValueArgs}"
97-
"${multiValueArgs}" ${ARGN})
98-
99-
set(target
100-
"beman.any_view.${beman_executable_CATEGORY}.${beman_executable_TARGET}")
101-
102-
if(NOT beman_executable_SOURCES)
103-
set(beman_executable_SOURCES "${beman_executable_TARGET}.cpp")
104-
endif()
105-
106-
add_executable(${target})
107-
target_sources(${target} PRIVATE ${beman_executable_SOURCES})
108-
target_link_libraries(${target} PRIVATE beman::any_view
109-
${beman_executable_LIBRARIES})
102+
set(options)
103+
set(oneValueArgs CATEGORY TARGET)
104+
set(multiValueArgs SOURCES LIBRARIES)
105+
106+
cmake_parse_arguments(
107+
beman_executable
108+
"${options}"
109+
"${oneValueArgs}"
110+
"${multiValueArgs}"
111+
${ARGN}
112+
)
113+
114+
set(target
115+
"beman.any_view.${beman_executable_CATEGORY}.${beman_executable_TARGET}"
116+
)
117+
118+
if(NOT beman_executable_SOURCES)
119+
set(beman_executable_SOURCES "${beman_executable_TARGET}.cpp")
120+
endif()
121+
122+
add_executable(${target})
123+
target_sources(${target} PRIVATE ${beman_executable_SOURCES})
124+
target_link_libraries(
125+
${target}
126+
PRIVATE beman::any_view ${beman_executable_LIBRARIES}
127+
)
110128
endmacro()
111129

112130
if(BEMAN_ANY_VIEW_BUILD_TESTS)
113-
enable_testing()
114-
115-
# Fetch GoogleTest
116-
FetchContent_Declare(
117-
googletest
118-
GIT_REPOSITORY https://github.com/google/googletest.git
119-
GIT_TAG v1.14.0
120-
EXCLUDE_FROM_ALL)
121-
set(INSTALL_GTEST OFF) # Disable GoogleTest installation
122-
FetchContent_MakeAvailable(googletest)
123-
124-
add_subdirectory(tests/beman/any_view)
131+
enable_testing()
132+
133+
# Fetch GoogleTest
134+
FetchContent_Declare(
135+
googletest
136+
GIT_REPOSITORY https://github.com/google/googletest.git
137+
GIT_TAG v1.14.0
138+
EXCLUDE_FROM_ALL
139+
)
140+
set(INSTALL_GTEST OFF) # Disable GoogleTest installation
141+
FetchContent_MakeAvailable(googletest)
142+
143+
add_subdirectory(tests/beman/any_view)
125144
endif()

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
1414

1515
## Usage
1616

17-
`std::ranges::any_view` is a class template that provides a type-erased interface for `std::ranges::view`. It may additionally model other concepts like `std::ranges::contiguous_range`, `std::ranges::sized_range`, `std::ranges::borrowed_range`, and `std::copyable` depending on the instantiation.
17+
`std::ranges::any_view` is a class template that provides a type-erased interface for `std::ranges::view`.
18+
It may additionally model other concepts like `std::ranges::contiguous_range`, `std::ranges::sized_range`,
19+
`std::ranges::borrowed_range`, and `std::copyable` depending on the instantiation.
1820

1921
## Integrate beman.any_view into your project
2022

@@ -34,7 +36,8 @@ FetchContent_Declare(
3436
FetchContent_MakeAvailable(beman.any_view)
3537
```
3638

37-
You will also need to add `beman::any_view` to the link libraries of any targets that include `beman/any_view/*.hpp` in their source or header files:
39+
You will also need to add `beman::any_view` to the link libraries of any targets that include `beman/any_view/*.hpp` in
40+
their source or header files:
3841

3942
```cmake
4043
target_link_libraries(yourlib PUBLIC beman::any_view)

‎tests/beman/any_view/CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
include(GoogleTest)
44

55
function(beman_add_test)
6-
beman_add_executable(${ARGN} CATEGORY tests LIBRARIES GTest::gtest
7-
GTest::gtest_main)
8-
gtest_discover_tests(${target})
6+
beman_add_executable(${ARGN} CATEGORY tests LIBRARIES GTest::gtest
7+
GTest::gtest_main
8+
)
9+
gtest_discover_tests(${target})
910
endfunction()
1011

1112
beman_add_test(TARGET concepts SOURCES concepts.test.cpp)

0 commit comments

Comments
 (0)