From 79a6478a976abfa0290121bf3656189f1e074fd5 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Thu, 24 Aug 2023 11:16:11 +0200 Subject: [PATCH 1/3] [wheel] Updated scikit-build-core. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 24ef5d25359..199ea98c438 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ cmake.args = ["--preset", "wheel"] cmake.minimum-version = "3.22.0" experimental = true metadata.version.provider = "scikit_build_core.metadata.setuptools_scm" -minimum-version = "0.4.3" +minimum-version = "0.5.0" ninja.make-fallback = false wheel.packages = ["Applications/Python/ogs"] From b083a31087bae17a2ca4db60ab335398d3b6443b Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Thu, 24 Aug 2023 11:16:28 +0200 Subject: [PATCH 2/3] [wheel] Fixed scikit-build scripts dynamic metadata plugin. https://github.com/scikit-build/scikit-build-core/pull/457 --- scripts/python/scikit-build-plugins/scripts/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/python/scikit-build-plugins/scripts/__init__.py b/scripts/python/scikit-build-plugins/scripts/__init__.py index 59232a324cc..73780553db2 100644 --- a/scripts/python/scikit-build-plugins/scripts/__init__.py +++ b/scripts/python/scikit-build-plugins/scripts/__init__.py @@ -14,10 +14,10 @@ def __dir__() -> list[str]: def dynamic_metadata( - fields: frozenset[str], + field: str, settings: dict[str, object] | None = None, -) -> dict[str, str | dict[str, str | None]]: - if fields != {"scripts"}: +) -> str: + if field != "scripts": msg = "Only the 'scripts' field is supported" raise ValueError(msg) @@ -25,4 +25,4 @@ def dynamic_metadata( msg = "No inline configuration is supported" raise ValueError(msg) - return {"scripts": pyproject_get_binaries()} + return pyproject_get_binaries() From 4c2eb54301f9df60e4bb0b90a7b63d50e834bf34 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Thu, 24 Aug 2023 12:30:26 +0200 Subject: [PATCH 3/3] [cmake] Fix fmt-target. --- GeoLib/CMakeLists.txt | 2 +- MathLib/CMakeLists.txt | 2 +- scripts/cmake/CheckHeaderCompilation.cmake | 2 +- scripts/cmake/Dependencies.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt index d26bd651ee6..153810e21b4 100644 --- a/GeoLib/CMakeLists.txt +++ b/GeoLib/CMakeLists.txt @@ -17,7 +17,7 @@ target_link_libraries( PUBLIC BaseLib Eigen3::Eigen MathLib $<$:rapidxml> $<$:Qt5::Xml> $<$:Qt5::XmlPatterns> - fmt::fmt + fmt::fmt-header-only PRIVATE range-v3 tet ) diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt index 1a98e56bdb2..d184bfca005 100644 --- a/MathLib/CMakeLists.txt +++ b/MathLib/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries( $<$:petsc> Eigen3::Eigen $<$:OpenMP::OpenMP_CXX> - fmt::fmt + fmt::fmt-header-only ) if(OGS_USE_LIS) diff --git a/scripts/cmake/CheckHeaderCompilation.cmake b/scripts/cmake/CheckHeaderCompilation.cmake index 15df621a6fe..fd8adb5cacd 100644 --- a/scripts/cmake/CheckHeaderCompilation.cmake +++ b/scripts/cmake/CheckHeaderCompilation.cmake @@ -45,7 +45,7 @@ function(_check_header_compilation target) nlohmann_json::nlohmann_json range-v3 # petsc; is given via ${PETSC_INCLUDES} below. - fmt::fmt + fmt::fmt-header-only ) # Ignore non-existing targets or interface libs if(NOT TARGET ${lib}) diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake index fcd15b66594..0a6cf4a8439 100644 --- a/scripts/cmake/Dependencies.cmake +++ b/scripts/cmake/Dependencies.cmake @@ -33,7 +33,7 @@ endif() # Check spdlog release for compatible fmt release. fmt may be provided by vtk # _ext build. -if(NOT TARGET fmt::fmt) +if(NOT TARGET fmt::fmt-header-only) CPMFindPackage( NAME fmt GIT_TAG 10.1.0