Skip to content

Commit 50ded6a

Browse files
committed
Reformat CML.txt for lint
Further CML lint
1 parent aaec2f5 commit 50ded6a

File tree

5 files changed

+55
-51
lines changed

5 files changed

+55
-51
lines changed

CMakeLists.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ include(FetchContent)
1212

1313
set(TARGETS_EXPORT_NAME ${CMAKE_PROJECT_NAME}Targets)
1414

15-
option(OPTIONAL26_ENABLE_TESTING
16-
"Enable building tests and test infrastructure"
17-
${PROJECT_IS_TOP_LEVEL})
15+
option(
16+
OPTIONAL26_ENABLE_TESTING
17+
"Enable building tests and test infrastructure"
18+
${PROJECT_IS_TOP_LEVEL}
19+
)
1820

1921
# Build the tests if enabled via the option OPTIONAL26_ENABLE_TESTING
2022
if(OPTIONAL26_ENABLE_TESTING)
@@ -31,24 +33,22 @@ endif()
3133

3234
# Create the library target and named header set for beman_optional26
3335
add_library(beman_optional26 STATIC)
34-
target_sources(beman_optional26
35-
PUBLIC
36-
FILE_SET beman_optional26_headers TYPE HEADERS
37-
BASE_DIRS
38-
src
39-
include
36+
target_sources(
37+
beman_optional26
38+
PUBLIC FILE_SET beman_optional26_headers TYPE HEADERS BASE_DIRS src include
4039
)
4140

4241
if(OPTIONAL26_ENABLE_TESTING)
43-
# Create the library target and named header set for testing beman_optional26
44-
# and mark the set private
45-
add_executable(beman_optional26_test)
46-
target_sources(beman_optional26_test
47-
PRIVATE
48-
FILE_SET beman_optional26_test_headers TYPE HEADERS
49-
BASE_DIRS
50-
src
51-
)
42+
# Create the library target and named header set for testing beman_optional26
43+
# and mark the set private
44+
add_executable(beman_optional26_test)
45+
target_sources(
46+
beman_optional26_test
47+
PRIVATE
48+
FILE_SET beman_optional26_test_headers
49+
TYPE HEADERS
50+
BASE_DIRS src
51+
)
5252
endif()
5353

5454
add_subdirectory(src/beman/optional26)

examples/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ foreach(example ${EXAMPLES})
2929

3030
# Install .
3131
install(
32-
TARGETS ${example}
33-
COMPONENT beman_optional26_examples
34-
DESTINATION
35-
${CMAKE_INSTALL_BINDIR}
32+
TARGETS
33+
${example}
34+
COMPONENT
35+
beman_optional26_examples
36+
DESTINATION
37+
${CMAKE_INSTALL_BINDIR}
3638
)
3739
endforeach()
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# include/beman/optional26/CMakeLists.txt -*-cmake-*-
22
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
33

4-
target_sources(beman_optional26
5-
PUBLIC
6-
FILE_SET beman_optional26_headers TYPE HEADERS
7-
FILES
8-
optional.hpp
9-
detail/iterator.hpp
10-
detail/stl_interfaces/config.hpp
11-
detail/stl_interfaces/fwd.hpp
12-
detail/stl_interfaces/iterator_interface.hpp
4+
target_sources(
5+
beman_optional26
6+
PUBLIC
7+
FILE_SET beman_optional26_headers
8+
TYPE HEADERS
9+
FILES
10+
optional.hpp
11+
detail/iterator.hpp
12+
detail/stl_interfaces/config.hpp
13+
detail/stl_interfaces/fwd.hpp
14+
detail/stl_interfaces/iterator_interface.hpp
1315
)

src/beman/optional26/CMakeLists.txt

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
33

44
# Ensure that optional and iterator get compiled at least once
5-
target_sources(beman_optional26
6-
PUBLIC
7-
optional.cpp
8-
detail/iterator.cpp)
5+
target_sources(beman_optional26 PUBLIC optional.cpp detail/iterator.cpp)
96

107
# The library is empty -- exclude it
11-
install(TARGETS beman_optional26
12-
ARCHIVE
13-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
14-
COMPONENT beman_optional26_library
15-
EXCLUDE_FROM_ALL)
8+
install(
9+
TARGETS beman_optional26
10+
ARCHIVE
11+
DESTINATION ${CMAKE_INSTALL_LIBDIR}
12+
COMPONENT beman_optional26_library
13+
EXCLUDE_FROM_ALL
14+
)
1615

17-
install(TARGETS beman_optional26
18-
FILE_SET beman_optional26_headers
19-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
20-
COMPONENT beman_optional26_development)
16+
install(
17+
TARGETS beman_optional26
18+
FILE_SET beman_optional26_headers
19+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
20+
COMPONENT beman_optional26_development
21+
)
2122

2223
# Tests
2324
if(OPTIONAL26_ENABLE_TESTING)

src/beman/optional26/tests/CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ target_sources(
2121
test_utilities.cpp
2222
)
2323

24-
25-
target_sources(beman_optional26_test
26-
PRIVATE
27-
FILE_SET beman_optional26_test_headers TYPE HEADERS
28-
FILES
29-
test_types.hpp
30-
test_utilities.hpp
24+
target_sources(
25+
beman_optional26_test
26+
PRIVATE
27+
FILE_SET beman_optional26_test_headers
28+
TYPE HEADERS
29+
FILES test_types.hpp test_utilities.hpp
3130
)
3231

3332
target_link_libraries(

0 commit comments

Comments
 (0)