Skip to content

Commit 20ec16c

Browse files
committed
feat: drop CMake 3.6 and below, modernize CMake
fix: include PYTHON_IS_DEBUG
1 parent 1491c94 commit 20ec16c

File tree

16 files changed

+333
-363
lines changed

16 files changed

+333
-363
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ jobs:
9595
- name: Configure C++11
9696
shell: bash
9797
run: >
98-
cmake --version &&
9998
cmake -S . -B build
10099
-DPYBIND11_WERROR=ON
101100
-DDOWNLOAD_CATCH=ON
@@ -163,7 +162,6 @@ jobs:
163162
- name: Configure
164163
shell: bash
165164
run: >
166-
cmake --version &&
167165
cmake -S . -B build
168166
-DPYBIND11_WERROR=ON
169167
-DDOWNLOAD_CATCH=ON
@@ -210,7 +208,6 @@ jobs:
210208
- name: Configure
211209
shell: bash
212210
run: >
213-
cmake --version &&
214211
cmake -S . -B build
215212
-DPYBIND11_WERROR=ON
216213
-DDOWNLOAD_CATCH=ON
@@ -256,7 +253,6 @@ jobs:
256253
- name: Configure
257254
shell: bash
258255
run: >
259-
cmake --version &&
260256
cmake -S . -B build
261257
-DPYBIND11_WERROR=ON
262258
-DDOWNLOAD_CATCH=ON

.github/workflows/configure.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,31 @@ jobs:
3434

3535
- name: Make build directories
3636
run: |
37-
mkdir build2.8
3837
mkdir build3.7
38+
mkdir build3.11
3939
mkdir build3.18
4040
41-
- name: Setup CMake 2.8
41+
- name: Setup CMake 3.7
4242
uses: jwlawson/[email protected]
4343
with:
44-
cmake-version: 2.8
44+
cmake-version: 3.7
4545

46-
- name: Configure 2.8
47-
working-directory: build2.8
46+
- name: Configure 3.7
47+
working-directory: build3.7
4848
run: >
49-
cmake --version &&
5049
cmake ..
5150
-DPYBIND11_WERROR=ON
5251
-DDOWNLOAD_CATCH=ON
5352
-DPYTHON_EXECUTABLE=$(python -c "import sys; print(sys.executable)")
5453
55-
- name: Setup CMake 3.7
54+
- name: Setup CMake 3.11
5655
uses: jwlawson/[email protected]
5756
with:
58-
cmake-version: 3.7
57+
cmake-version: 3.11
5958

60-
- name: Configure 3.7
61-
working-directory: build3.7
59+
- name: Configure 3.11
60+
working-directory: build3.11
6261
run: >
63-
cmake --version &&
6462
cmake ..
6563
-DPYBIND11_WERROR=ON
6664
-DDOWNLOAD_CATCH=ON
@@ -74,7 +72,6 @@ jobs:
7472
- name: Configure 3.18
7573
working-directory: build3.18
7674
run: >
77-
cmake --version &&
7875
cmake ..
7976
-DPYBIND11_WERROR=ON
8077
-DDOWNLOAD_CATCH=ON

0 commit comments

Comments
 (0)