Merge branch 'scikit-build-update' into 'master'

[wheel] Fixed scikit-build scripts dynamic metadata plugin. See merge request ogs/ogs!4714
ufz · Aug 24, 2023 · 2960d7b · 2960d7b
2 parents 30ff596 + 4c2eb54
commit 2960d7b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(
     PUBLIC BaseLib Eigen3::Eigen MathLib $<$<BOOL:${OGS_BUILD_GUI}>:rapidxml>
            $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::Xml>
            $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::XmlPatterns>
-           fmt::fmt
+           fmt::fmt-header-only
     PRIVATE range-v3 tet
 )
 

diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(
            $<$<BOOL:${OGS_USE_PETSC}>:petsc>
            Eigen3::Eigen
            $<$<TARGET_EXISTS:OpenMP::OpenMP_CXX>:OpenMP::OpenMP_CXX>
-           fmt::fmt
+           fmt::fmt-header-only
 )
 
 if(OGS_USE_LIS)

diff --git 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"]
 

diff --git 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
@@ -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

diff --git a/scripts/python/scikit-build-plugins/scripts/__init__.py b/scripts/python/scikit-build-plugins/scripts/__init__.py
@@ -14,15 +14,15 @@ 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)
 
     if settings:
         msg = "No inline configuration is supported"
         raise ValueError(msg)
 
-    return {"scripts": pyproject_get_binaries()}
+    return pyproject_get_binaries()