Skip to content

Commit 65bb78e

Browse files
committed
Run cmake-format linter
1 parent 21a53d4 commit 65bb78e

File tree

8 files changed

+50
-56
lines changed

8 files changed

+50
-56
lines changed

CMakeLists.txt

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
# cmake-format: off
12
# /CMakeLists.txt -*-makefile-*-
23
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4+
# cmake-format: on
35

46
cmake_minimum_required(VERSION 3.10)
57

6-
project(beman_optional26 VERSION 0.0.0 LANGUAGES CXX)
8+
project(
9+
beman_optional26
10+
VERSION 0.0.0
11+
LANGUAGES CXX)
712

813
enable_testing()
914

@@ -20,25 +25,21 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake)
2025
install(
2126
EXPORT ${TARGETS_EXPORT_NAME}
2227
NAMESPACE ${CMAKE_PROJECT_NAME}
23-
DESTINATION ${INSTALL_CONFIGDIR}
24-
)
28+
DESTINATION ${INSTALL_CONFIGDIR})
2529

2630
include(CMakePackageConfigHelpers)
2731

2832
write_basic_package_version_file(
29-
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
30-
VERSION ${PROJECT_VERSION}
31-
COMPATIBILITY AnyNewerVersion
32-
)
33+
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
34+
VERSION ${PROJECT_VERSION}
35+
COMPATIBILITY AnyNewerVersion)
3336

3437
configure_package_config_file(
35-
"cmake/Config.cmake.in"
36-
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
37-
INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
38-
)
39-
40-
install(FILES
41-
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
42-
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
43-
DESTINATION ${INSTALL_CONFIGDIR}
44-
)
38+
"cmake/Config.cmake.in"
39+
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
40+
INSTALL_DESTINATION ${INSTALL_CONFIGDIR})
41+
42+
install(
43+
FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
44+
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
45+
DESTINATION ${INSTALL_CONFIGDIR})

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#! /usr/bin/make -f
2+
# cmake-format: off
23
# /Makefile -*-makefile-*-
34
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
5+
# cmake-format: on
46

57
INSTALL_PREFIX?=.install/
68
PROJECT?=$(shell basename $(CURDIR))

examples/CMakeLists.txt

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
1+
# cmake-format: off
12
# examples/CMakeLists.txt -*-makefile-*-
23
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4+
# cmake-format: on
35

46
set(BEMAN_OPTIONAL26_LIBRARY "beman_optional26")
57

68
include(GNUInstallDirs)
79

810
# List of all buildable examples.
9-
set(EXAMPLES
10-
concept_checks
11-
optional_ref
12-
pythagorean_triples
13-
range_loop
14-
sample
15-
std_vs_beman
16-
)
11+
set(EXAMPLES concept_checks optional_ref pythagorean_triples range_loop sample
12+
std_vs_beman)
1713

1814
foreach(EXAMPLE ${EXAMPLES})
1915
# Add example executable.
2016
add_executable(${EXAMPLE} "")
2117

2218
# Add example source file.
23-
target_sources(
24-
${EXAMPLE}
25-
PRIVATE
26-
${EXAMPLE}.cpp
27-
)
19+
target_sources(${EXAMPLE} PRIVATE ${EXAMPLE}.cpp)
2820

2921
# Link example with the library.
3022
target_link_libraries(${EXAMPLE} "${BEMAN_OPTIONAL26_LIBRARY}")
@@ -33,6 +25,5 @@ foreach(EXAMPLE ${EXAMPLES})
3325
install(
3426
TARGETS ${EXAMPLE}
3527
EXPORT ${TARGETS_EXPORT_NAME}
36-
DESTINATION ${CMAKE_INSTALL_BINDIR}
37-
)
28+
DESTINATION ${CMAKE_INSTALL_BINDIR})
3829
endforeach()

extern/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
# cmake-format: off
12
# extern/CMakeLists.txt -*-makefile-*-
23
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4+
# cmake-format: on
35

46
add_subdirectory(googletest EXCLUDE_FROM_ALL)

scripts/lint-all.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ echo "All C++ files were linted."
1818
find scripts/ -name "*.sh" | xargs shellcheck || echo "shellcheck failed."
1919
echo "All scripts files were linted."
2020

21-
# TODO: Lint all CMake files in the project.
22-
# echo "All CMake files were linted."
21+
# Lint all CMake files in the project.
22+
find . -name CMakeLists.txt | xargs cmake-format -i || echo "cmake-format failed."
23+
echo "All CMake files were linted."
2324

2425
# Lint all Markdown files in the project.
2526
find README.md examples/ -name "*.md" | xargs markdownlint -f || echo "markdownlint failed."

src/Beman/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
# cmake-format: off
12
# src/Beman/CMakeLists.txt -*-makefile-*-
23
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4+
# cmake-format: on
35

46
add_subdirectory(Optional26)

src/Beman/Optional26/CMakeLists.txt

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,47 @@
1+
# cmake-format: off
12
# src/Beman/Optional26/CMakeLists.txt -*-makefile-*-
23
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4+
# cmake-format: on
35

46
set(TARGET_LIBRARY "beman_optional26")
57

68
add_library("${TARGET_LIBRARY}" STATIC "")
79

8-
target_sources(
9-
"${TARGET_LIBRARY}"
10-
PRIVATE
11-
optional.cpp
12-
detail/iterator.cpp
13-
)
10+
target_sources("${TARGET_LIBRARY}" PRIVATE optional.cpp detail/iterator.cpp)
1411

1512
include(GNUInstallDirs)
1613
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
1714

18-
target_include_directories("${TARGET_LIBRARY}" PUBLIC
19-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../include>
20-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LOWER_PROJECT_NAME}> # <prefix>/include/scratch
15+
target_include_directories(
16+
"${TARGET_LIBRARY}"
17+
PUBLIC
18+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../include>
19+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LOWER_PROJECT_NAME}> # <prefix>/include/scratch
2120
)
2221

2322
install(
2423
TARGETS "${TARGET_LIBRARY}"
2524
EXPORT ${TARGETS_EXPORT_NAME}1
26-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
27-
)
25+
DESTINATION ${CMAKE_INSTALL_LIBDIR})
2826

2927
string(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_LOWER_PROJECT_NAME)
3028

3129
install(
3230
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
3331
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LOWER_PROJECT_NAME}
34-
FILES_MATCHING PATTERN "*.hpp"
35-
)
32+
FILES_MATCHING
33+
PATTERN "*.hpp")
3634

3735
target_link_libraries("${TARGET_LIBRARY}")
3836

39-
## Tests
37+
# Tests
4038
add_executable(optional_test "")
4139

4240
target_sources(
4341
optional_test
44-
PRIVATE
45-
tests/optional.t.cpp
46-
tests/optional_ref.t.cpp
47-
tests/optional_monadic.t.cpp
48-
tests/optional_range_support.t.cpp
49-
tests/optional_ref_monadic.t.cpp
50-
tests/detail/iterator.t.cpp
51-
)
42+
PRIVATE tests/optional.t.cpp tests/optional_ref.t.cpp
43+
tests/optional_monadic.t.cpp tests/optional_range_support.t.cpp
44+
tests/optional_ref_monadic.t.cpp tests/detail/iterator.t.cpp)
5245

5346
target_link_libraries(optional_test "${TARGET_LIBRARY}")
5447
target_link_libraries(optional_test gtest)

src/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
# cmake-format: off
12
# src/CMakeLists.txt -*-makefile-*-
23
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4+
# cmake-format: on
35

46
add_subdirectory(Beman)

0 commit comments

Comments
 (0)