This is an automated email from the ASF dual-hosted git repository.
hsluoyz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/casbin-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 6ffebc0 feat: upgrade CMake, googletest, nlohmann_json, benchmark and
pybind11
6ffebc0 is described below
commit 6ffebc0b2babed82204900155fadd10f7c801a42
Author: Yang Luo <[email protected]>
AuthorDate: Sat Oct 31 09:28:37 2026 +0800
feat: upgrade CMake, googletest, nlohmann_json, benchmark and pybind11
---
.github/workflows/benchmark.yml | 6 +++---
.github/workflows/ci.yml | 18 +++++++++---------
.github/workflows/memcheck.yml | 6 +++---
.github/workflows/python_binding.yml | 6 +++---
.github/workflows/release.yml | 6 +++---
cmake/modules/Findbenchmark.cmake | 9 +--------
cmake/modules/Findgoogletest.cmake | 9 +--------
cmake/modules/Findjson.cmake | 2 +-
cmake/modules/Findpybind11.cmake | 10 +---------
setup.py | 10 +++++++---
10 files changed, 32 insertions(+), 50 deletions(-)
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 573c419..f4f7565 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -27,13 +27,13 @@ jobs:
steps:
- name: Checkout
id: checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v7
- name: Setup Python
- uses: actions/setup-python@v5
+ uses: actions/setup-python@v7
with:
python-version: '3.x'
- name: Setup CMake
- run: pip install "cmake==3.25.*"
+ run: pip install "cmake==4.4.*"
- name: Configuring CMake files
id: building-files
run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 35370c3..924aa06 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,13 +27,13 @@ jobs:
steps:
- name: Checkout
id: checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v7
- name: Setup Python
- uses: actions/setup-python@v5
+ uses: actions/setup-python@v7
with:
python-version: '3.x'
- name: Setup CMake
- run: pip install "cmake==3.25.*"
+ run: pip install "cmake==4.4.*"
- name: Configuring CMake files
id: building-files
run: |
@@ -58,13 +58,13 @@ jobs:
steps:
- name: Checkout
id: checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v7
- name: Setup Python
- uses: actions/setup-python@v5
+ uses: actions/setup-python@v7
with:
python-version: '3.x'
- name: Setup CMake
- run: pip install "cmake==3.25.*"
+ run: pip install "cmake==4.4.*"
- name: Set up MSVC environment
uses: ilammy/msvc-dev-cmd@v1
- name: Configuring CMake files
@@ -90,13 +90,13 @@ jobs:
steps:
- name: Checkout
id: checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v7
- name: Setup Python
- uses: actions/setup-python@v5
+ uses: actions/setup-python@v7
with:
python-version: '3.x'
- name: Setup CMake
- run: pip install "cmake==3.25.*"
+ run: pip install "cmake==4.4.*"
- name: Configuring CMake files
id: building-files
run: |
diff --git a/.github/workflows/memcheck.yml b/.github/workflows/memcheck.yml
index 1c9edc0..89318b5 100644
--- a/.github/workflows/memcheck.yml
+++ b/.github/workflows/memcheck.yml
@@ -27,13 +27,13 @@ jobs:
steps:
- name: Checkout
id: checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v7
- name: Setup Python
- uses: actions/setup-python@v5
+ uses: actions/setup-python@v7
with:
python-version: '3.x'
- name: Setup CMake
- run: pip install "cmake==3.25.*"
+ run: pip install "cmake==4.4.*"
- name: Install requirement
id: install-requirements
run: |
diff --git a/.github/workflows/python_binding.yml
b/.github/workflows/python_binding.yml
index 5128bb2..2da0ea6 100644
--- a/.github/workflows/python_binding.yml
+++ b/.github/workflows/python_binding.yml
@@ -26,15 +26,15 @@ jobs:
fail-fast: false
matrix:
platform: [windows-latest, ubuntu-latest]
- python-version: ["3.12"]
+ python-version: ["3.14"]
runs-on: ${{ matrix.platform }}
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v7
with:
submodules: true
- - uses: actions/setup-python@v5
+ - uses: actions/setup-python@v7
with:
python-version: ${{ matrix.python-version }}
- name: Add requirements
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5c5e05f..989dbed 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -45,7 +45,7 @@ jobs:
prerelease: ${{ steps.meta.outputs.prerelease }}
steps:
- name: Checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v7
with:
fetch-depth: 0
@@ -138,13 +138,13 @@ jobs:
- name: Checkout casbin-cpp
if: steps.gate.outputs.enabled == 'true'
- uses: actions/checkout@v4
+ uses: actions/checkout@v7
with:
path: casbin-cpp
- name: Checkout vcpkg
if: steps.gate.outputs.enabled == 'true'
- uses: actions/checkout@v4
+ uses: actions/checkout@v7
with:
repository: microsoft/vcpkg
path: vcpkg
diff --git a/cmake/modules/Findbenchmark.cmake
b/cmake/modules/Findbenchmark.cmake
index 3ac9f8d..6716d19 100644
--- a/cmake/modules/Findbenchmark.cmake
+++ b/cmake/modules/Findbenchmark.cmake
@@ -17,16 +17,9 @@ include(FetchContent)
FetchContent_Declare(
benchmark
GIT_REPOSITORY https://github.com/google/benchmark.git
- GIT_TAG v1.8.3
+ GIT_TAG v1.10.0
DOWNLOAD_EXTRACT_TIMESTAMP FALSE
)
set(BENCHMARK_ENABLE_TESTING OFF)
FetchContent_MakeAvailable(benchmark)
-
-FetchContent_GetProperties(benchmark)
-
-if(NOT benchmark_POPULATED)
- FetchContent_Populate(benchmark)
- add_subdirectory(${benchmark_SOURCE_DIR} ${benchmark_BINARY_DIR})
-endif()
\ No newline at end of file
diff --git a/cmake/modules/Findgoogletest.cmake
b/cmake/modules/Findgoogletest.cmake
index a98df46..b59015e 100644
--- a/cmake/modules/Findgoogletest.cmake
+++ b/cmake/modules/Findgoogletest.cmake
@@ -17,7 +17,7 @@ include(FetchContent)
FetchContent_Declare(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
- GIT_TAG v1.14.0
+ GIT_TAG v1.18.0
DOWNLOAD_EXTRACT_TIMESTAMP FALSE
)
@@ -25,10 +25,3 @@ FetchContent_Declare(
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(googletest)
-FetchContent_GetProperties(googletest)
-
-# Populating manually, if not done automatically
-if(NOT googletest_POPULATED)
- FetchContent_Populate(googletest)
- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
-endif()
diff --git a/cmake/modules/Findjson.cmake b/cmake/modules/Findjson.cmake
index 343dd37..61798fd 100644
--- a/cmake/modules/Findjson.cmake
+++ b/cmake/modules/Findjson.cmake
@@ -29,7 +29,7 @@ if(NOT nlohmann_json_FOUND)
FetchContent_Declare(
json
GIT_REPOSITORY https://github.com/nlohmann/json.git
- GIT_TAG v3.11.2
+ GIT_TAG v3.12.0
DOWNLOAD_EXTRACT_TIMESTAMP FALSE
)
diff --git a/cmake/modules/Findpybind11.cmake b/cmake/modules/Findpybind11.cmake
index 6e98ee6..b885092 100644
--- a/cmake/modules/Findpybind11.cmake
+++ b/cmake/modules/Findpybind11.cmake
@@ -17,16 +17,8 @@ include(FetchContent)
FetchContent_Declare(
pybind11
GIT_REPOSITORY https://github.com/pybind/pybind11.git
- GIT_TAG v2.11.1
+ GIT_TAG v3.1.0
DOWNLOAD_EXTRACT_TIMESTAMP FALSE
)
FetchContent_MakeAvailable(pybind11)
-
-FetchContent_GetProperties(pybind11)
-
-# Populating manually, if not done automatically
-if(NOT pybind11_POPULATED)
- FetchContent_Populate(pybind11)
- add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR})
-endif()
diff --git a/setup.py b/setup.py
index b3bd835..0e8fadb 100644
--- a/setup.py
+++ b/setup.py
@@ -142,11 +142,15 @@ setup(
ext_modules=[CMakeExtension("")],
cmdclass={"build_ext": CMakeBuild},
zip_safe=False,
- python_requires=">=3.7",
+ python_requires=">=3.9",
license="Apache 2.0",
classifiers=[
- "Programming Language :: Python :: 3.7",
- "Programming Language :: Python :: 3.8",
+ "Programming Language :: Python :: 3.9",
+ "Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
+ "Programming Language :: Python :: 3.13",
+ "Programming Language :: Python :: 3.14",
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
],
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
