Skip to content

Commit 02a577e

Browse files
committed
πŸ‘·β€β™€οΈ Always use ninja
1 parent 181f0ff commit 02a577e

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

β€Ž.github/workflows/macosx.ymlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717

1818
- name: configure
1919
run: |
20-
cmake -B build/debug -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
21-
cmake -B build/release -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
20+
cmake -B build/debug -G Ninja -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
21+
cmake -B build/release -G Ninja -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
2222
2323
- name: build
2424
run: |

β€Ž.github/workflows/ubuntu.ymlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717

1818
- name: configure
1919
run: |
20-
cmake -B build/debug -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
21-
cmake -B build/release -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
20+
cmake -B build/debug -G Ninja -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
21+
cmake -B build/release -G Ninja -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
2222
2323
- name: build
2424
run: |

β€Ž.github/workflows/windows.ymlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717

1818
- name: configure
1919
run: |
20-
cmake -B build/debug -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
21-
cmake -B build/release -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
20+
cmake -B build/debug -G Ninja -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
21+
cmake -B build/release -G Ninja -D ZTD_OUT_PTR_TESTS=ON -D ZTD_OUT_PTR_EXAMPLES=ON
2222
2323
- name: build
2424
run: |

β€ŽCMakeLists.txtβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
# See https://github.com/ThePhD/out_ptr/blob/master/docs/out_ptr.adoc for documentation.
1616

17-
cmake_minimum_required(VERSION 3.15)
17+
cmake_minimum_required(VERSION 3.28.0)
1818
project(ztd.out_ptr VERSION 1.0.0 DESCRIPTION "A library for having output pointers in C-like functions work well with C++ smart pointer types." LANGUAGES C CXX)
1919

2020
# # Inclusion Work

β€Žbenchmarks/CMakeLists.txtβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function (google_benchmark_dependency_jail)
2525
google_benchmark
2626
GIT_REPOSITORY https://github.com/google/benchmark.git
2727
GIT_TAG main
28+
EXCLUDE_FROM_ALL
2829
)
2930
# Benchmark variables, internal setup
3031
set(BENCHMARK_ENABLE_EXCEPTIONS ON)
@@ -44,7 +45,6 @@ function (google_benchmark_dependency_jail)
4445
set(HAVE_STD_REGEX ON)
4546
endif()
4647
FetchContent_MakeAvailable(google_benchmark)
47-
set_property(DIRECTORY "${google_benchmark_SOURCE_DIR}" PROPERTY EXCLUDE_FROM_ALL YES)
4848
endfunction()
4949
google_benchmark_dependency_jail()
5050

0 commit comments

Comments
Β (0)