Skip to content

chore: update CMake versions & vars #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henryiii merged 1 commit into from
Jun 27, 2023
Merged

chore: update CMake versions & vars #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- master
- main

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion projects/core-c-hello/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.15...3.25)
cmake_minimum_required(VERSION 3.15...3.26)

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

Expand Down
2 changes: 1 addition & 1 deletion projects/core-pybind11-hello/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.15...3.25)
cmake_minimum_required(VERSION 3.15...3.26)

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

Expand Down
5 changes: 1 addition & 4 deletions projects/hello-cmake-package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.14...3.19)
cmake_minimum_required(VERSION 3.15...3.26)

project(
hello
Expand Down Expand Up @@ -67,9 +67,6 @@ install(FILES "${PROJECT_BINARY_DIR}/helloConfig.cmake"
# build flow.
if(DEFINED SKBUILD)

# prevent an unused variable warning
set(ignoreMe "${SKBUILD}")

# call pybind11-config to obtain the root of the cmake package
execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pybind11 --cmakedir
OUTPUT_VARIABLE pybind11_ROOT_RAW)
Expand Down
2 changes: 1 addition & 1 deletion projects/hello-cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.4...3.22)
cmake_minimum_required(VERSION 3.15...3.26)

project(hello)

Expand Down
2 changes: 1 addition & 1 deletion projects/hello-cython/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5...3.22)
cmake_minimum_required(VERSION 3.15...3.26)

project(hello_cython)

Expand Down
11 changes: 4 additions & 7 deletions projects/hello-pybind11/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.14...3.22)
cmake_minimum_required(VERSION 3.15...3.26)

project(hello-pybind11 VERSION "0.1")

Expand All @@ -8,17 +8,14 @@ include(FetchContent)

FetchContent_Declare(
pybind11
URL https://github.com/pybind/pybind11/archive/refs/tags/v2.9.2.tar.gz
URL_HASH SHA256=6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1
URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.4.tar.gz
URL_HASH SHA256=832e2f309c57da9c1e6d4542dedd34b24e4192ecb4d62f6f4866a737454c9970
)
FetchContent_MakeAvailable(pybind11)

set(python_module_name _hello)
pybind11_add_module(${python_module_name} MODULE
src/hello/hello_py.cpp
)
)

install(TARGETS ${python_module_name} DESTINATION .)

# Quiet a warning, since this project is only valid with SKBUILD
set(ignoreMe "${SKBUILD}")
2 changes: 1 addition & 1 deletion projects/pen2-cython/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5...3.22)
cmake_minimum_required(VERSION 3.15...3.26)

project(pen2_cython)

Expand Down
2 changes: 1 addition & 1 deletion projects/tower-of-babel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5...3.22)
cmake_minimum_required(VERSION 3.15...3.26)

project(tower_of_babel)

Expand Down