Skip to content

Commit 4d641fa

Browse files
authored
chore: update CMake versions & vars (#38)
Signed-off-by: Henry Schreiner <[email protected]>
1 parent 52f172a commit 4d641fa

File tree

9 files changed

+12
-17
lines changed

9 files changed

+12
-17
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
push:
77
branches:
88
- master
9+
- main
910

1011
concurrency:
1112
group: ${{ github.workflow }}-${{ github.ref }}

projects/core-c-hello/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.15...3.25)
1+
cmake_minimum_required(VERSION 3.15...3.26)
22

33
project(${SKBUILD_PROJECT_NAME} VERSION ${SKBUILD_PROJECT_VERSION} LANGUAGES C)
44

projects/core-pybind11-hello/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.15...3.25)
1+
cmake_minimum_required(VERSION 3.15...3.26)
22

33
project(${SKBUILD_PROJECT_NAME} VERSION ${SKBUILD_PROJECT_VERSION} LANGUAGES CXX)
44

projects/hello-cmake-package/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.14...3.19)
1+
cmake_minimum_required(VERSION 3.15...3.26)
22

33
project(
44
hello
@@ -67,9 +67,6 @@ install(FILES "${PROJECT_BINARY_DIR}/helloConfig.cmake"
6767
# build flow.
6868
if(DEFINED SKBUILD)
6969

70-
# prevent an unused variable warning
71-
set(ignoreMe "${SKBUILD}")
72-
7370
# call pybind11-config to obtain the root of the cmake package
7471
execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pybind11 --cmakedir
7572
OUTPUT_VARIABLE pybind11_ROOT_RAW)

projects/hello-cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.4...3.22)
1+
cmake_minimum_required(VERSION 3.15...3.26)
22

33
project(hello)
44

projects/hello-cython/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5...3.22)
1+
cmake_minimum_required(VERSION 3.15...3.26)
22

33
project(hello_cython)
44

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.14...3.22)
1+
cmake_minimum_required(VERSION 3.15...3.26)
22

33
project(hello-pybind11 VERSION "0.1")
44

@@ -8,17 +8,14 @@ include(FetchContent)
88

99
FetchContent_Declare(
1010
pybind11
11-
URL https://github.com/pybind/pybind11/archive/refs/tags/v2.9.2.tar.gz
12-
URL_HASH SHA256=6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1
11+
URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.4.tar.gz
12+
URL_HASH SHA256=832e2f309c57da9c1e6d4542dedd34b24e4192ecb4d62f6f4866a737454c9970
1313
)
1414
FetchContent_MakeAvailable(pybind11)
1515

1616
set(python_module_name _hello)
1717
pybind11_add_module(${python_module_name} MODULE
1818
src/hello/hello_py.cpp
19-
)
19+
)
2020

2121
install(TARGETS ${python_module_name} DESTINATION .)
22-
23-
# Quiet a warning, since this project is only valid with SKBUILD
24-
set(ignoreMe "${SKBUILD}")

projects/pen2-cython/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5...3.22)
1+
cmake_minimum_required(VERSION 3.15...3.26)
22

33
project(pen2_cython)
44

projects/tower-of-babel/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5...3.22)
1+
cmake_minimum_required(VERSION 3.15...3.26)
22

33
project(tower_of_babel)
44

0 commit comments

Comments
 (0)