Skip to content

Commit 1383086

Browse files
committed
Fixes for lint errors in cmake
1 parent 8937387 commit 1383086

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

etc/gcc-14-toolchain.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ include("${CMAKE_CURRENT_LIST_DIR}/gcc-flags.cmake")
44

55
set(CMAKE_C_COMPILER gcc-14)
66
set(CMAKE_CXX_COMPILER g++-14)
7-
set(GCOV_EXECUTABLE
8-
"gcov-14"
9-
CACHE STRING "GCOV executable" FORCE)
7+
set(GCOV_EXECUTABLE "gcov-14" CACHE STRING "GCOV executable" FORCE)
108

119
set(CMAKE_CXX_FLAGS_ASAN
1210
"${CMAKE_CXX_FLAGS_ASAN} -Wno-maybe-uninitialized"
13-
CACHE STRING "C++ ASAN Flags" FORCE)
11+
CACHE STRING
12+
"C++ ASAN Flags"
13+
FORCE
14+
)

etc/gcc-15-toolchain.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ set(CMAKE_CXX_COMPILER g++-15)
77

88
set(CMAKE_CXX_FLAGS_ASAN
99
"${CMAKE_CXX_FLAGS_ASAN} -Wno-maybe-uninitialized"
10-
CACHE STRING "C++ ASAN Flags" FORCE)
10+
CACHE STRING
11+
"C++ ASAN Flags"
12+
FORCE
13+
)

etc/gcc-flags.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ set(CMAKE_CXX_FLAGS_TSAN
3030
)
3131
set(CMAKE_CXX_FLAGS_ASAN
3232
"-O3 -g -DNDEBUG -fsanitize=address,undefined,leak"
33-
CACHE STRING "C++ ASAN Flags" FORCE)
33+
CACHE STRING
34+
"C++ ASAN Flags"
35+
FORCE
36+
)
3437

3538
set(CMAKE_CXX_FLAGS_GCOV
3639
"-O0 -fno-inline -g --coverage -fprofile-abs-path"

src/beman/optional26/tests/CMakeLists.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ include(GoogleTest)
99
add_executable(beman_optional26_test)
1010

1111
target_sources(
12-
beman_optional26_test
13-
PRIVATE
12+
beman_optional26_test
13+
PRIVATE
1414
optional.t.cpp
1515
optional_constexpr.t.cpp
1616
optional_monadic.t.cpp
@@ -38,12 +38,16 @@ add_library(constructor_fails test_constructor_fail.cpp)
3838
target_link_libraries(constructor_fails PRIVATE beman_optional26)
3939

4040
set_target_properties(
41-
constructor_fails PROPERTIES EXCLUDE_FROM_ALL true EXCLUDE_FROM_DEFAULT_BUILD
42-
true)
41+
constructor_fails
42+
PROPERTIES EXCLUDE_FROM_ALL true EXCLUDE_FROM_DEFAULT_BUILD true
43+
)
4344

44-
add_test(NAME constructor_fails
45-
COMMAND ${CMAKE_COMMAND} --build "${CMAKE_BINARY_DIR}" --target
46-
constructor_fails --config $<CONFIGURATION>)
45+
add_test(
46+
NAME constructor_fails
47+
COMMAND
48+
${CMAKE_COMMAND} --build "${CMAKE_BINARY_DIR}" --target
49+
constructor_fails --config $<CONFIGURATION>
50+
)
4751

4852
set_tests_properties(constructor_fails PROPERTIES WILL_FAIL true)
4953
# Alternatively -- check for a particular regex to pass

0 commit comments

Comments
 (0)