Merge branch 'scikit_build' of https://github.com/NOAA-ORR-ERD/py_gd into scikit_build

Author: ChrisBarker-NOAA

CMakeLists.txt

@@ -1,21 +1,37 @@
-cmake_minimum_required(VERSION 3.20...4.0)
+cmake_minimum_required(VERSION 3.24...4.0)
 project(${SKBUILD_PROJECT_NAME} LANGUAGES C)
 
+option(BUILD_DEPS OFF)
+
 find_package(
   Python
   COMPONENTS Interpreter Development.Module NumPy
   REQUIRED)
 
 include(UseCython)
+include(GNUInstallDirs)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-find_package(GD MODULE REQUIRED)
+if(ENV{VCPKG_ROOT})
+  set(CMAKE_TOOLCHAIN_FILE "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
+endif()
+
+# We do not use FetchContent because the CMakeLists of GD is terrible
+if(BUILD_DEPS)
+    include(BuildGD)
+else()
+    find_package(GD MODULE REQUIRED)
+endif()
 
 cython_transpile(py_gd/py_gd.pyx LANGUAGE C OUTPUT_VARIABLE py_gd_c)
 python_add_library(py_gd MODULE "${py_gd_c}" WITH_SOABI)
 target_link_libraries(py_gd PUBLIC GD::GD Python::NumPy)
 install(TARGETS py_gd DESTINATION py_gd)
 
+get_filename_component(GD_LIBRARY_DIR "${GD_LIBRARIES}" DIRECTORY)
+set_target_properties(py_gd PROPERTIES INSTALL_RPATH "${GD_LIBRARY_DIR}")
+
 cython_transpile(py_gd/spline.pyx LANGUAGE C OUTPUT_VARIABLE spline_c)
 python_add_library(spline MODULE "${spline_c}" WITH_SOABI)
 target_link_libraries(spline PUBLIC Python::NumPy)

cmake/BuildGD.cmake

@@ -0,0 +1,35 @@
+include_guard(GLOBAL)
+
+include(ExternalProject)
+
+set(DEP_INSTALL_DIR ${CMAKE_BINARY_DIR}/_deps/install)
+ExternalProject_Add(
+  libpng_ep
+  URL http://prdownloads.sourceforge.net/libpng/libpng-1.6.50.tar.gz?download
+  URL_HASH SHA256=708f4398f996325819936d447f982e0db90b6b8212b7507e7672ea232210949a
+  CMAKE_ARGS
+    "-DCMAKE_INSTALL_PREFIX=${DEP_INSTALL_DIR}"
+)
+
+set(GD_LIBRARIES "${DEP_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/libgd${CMAKE_SHARED_LIBRARY_SUFFIX}")
+set(GD_INCLUDE_DIR "${DEP_INSTALL_DIR}/include")
+
+ExternalProject_Add(
+  GD_ep
+  GIT_REPOSITORY https://github.com/libgd/libgd.git
+  GIT_TAG gd-2.3.3
+  BUILD_BYPRODUCTS
+    "${GD_LIBRARIES}"
+    "${GD_INCLUDE_DIR}"
+  CMAKE_ARGS
+    "-DCMAKE_INSTALL_PREFIX=${DEP_INSTALL_DIR}"
+    -DENABLE_PNG=1
+)
+add_library(GD::GD SHARED IMPORTED GLOBAL)
+file(MAKE_DIRECTORY "${GD_INCLUDE_DIR}")
+set_target_properties(GD::GD PROPERTIES
+  IMPORTED_LOCATION "${GD_LIBRARIES}"
+  INTERFACE_INCLUDE_DIRECTORIES "${GD_INCLUDE_DIR}"
+)
+add_dependencies(GD_ep libpng_ep)
+add_dependencies(GD::GD GD_ep)

cmake/FindGD.cmake

@@ -6,20 +6,15 @@ endif()
 find_path(GD_INCLUDE_DIR
   NAMES gd.h
   HINTS "${PC_GD_INCLUDE_DIRS}"
-  REQUIRED
 )
 
 find_library(GD_LIBRARY
   NAMES gd
   HINTS "${PC_GD_INCLUDE_DIRS}"
-  REQUIRED
 )
 
 cmake_path(ABSOLUTE_PATH GD_LIBRARY)
 cmake_path(ABSOLUTE_PATH GD_INCLUDE_DIR)
-get_filename_component(GD_LIBRARY_DIR "${GD_LIBRARIES}" DIRECTORY)
-
-message (STATUS "libgd found at ${GD_LIBRARY}, ${GD_INCLUDE_DIR}")
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GD
@@ -41,7 +36,6 @@ if(GD_FOUND AND NOT TARGET GD::GD)
     IMPORTED_LOCATION "${GD_LIBRARY}"
     INTERFACE_COMPILE_OPTIONS "${PC_GD_CFLAGS_OTHER}"
     INTERFACE_INCLUDE_DIRECTORIES "${GD_INCLUDE_DIR}"
-    INTERFACE_LINK_DIRECTORIES "${GD_LIBRARY_DIR}"
   )
 endif()
 

pyproject.toml

@@ -38,6 +38,9 @@ test = ["pytest"]
 build = ["scikit-build-core", "cython", "numpy", "cython-cmake"]
 dev = [{ include-group = "test" }, { include-group = "build"}, "build"]
 
+[tool.scikit-build]
+build-dir = "build"
+
 [tool.scikit-build.metadata.version]
 provider = "scikit_build_core.metadata.regex"
 input = "py_gd/__init__.py"
@@ -51,14 +54,8 @@ linux.before-all = [
    "dnf install -y gd-devel",
 ]
 windows.before-all = [
-   "vcpkg install libgd pkgconf",
-]
-macos.before-all = [
-  "git clone https://github.com/libgd/libgd.git --branch gd-2.3.3 --depth 1",
-  "cmake -Slibgd -Bbuild-libgd -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install",
-  "cmake --build build-libgd",
-  "cmake --install build-libgd",
+   "vcpkg install libgd",
 ]
-macos.config-settings = { "cmake.define.GD_ROOT" = "./install"}
+macos.config-settings = { "cmake.define.BUILD_DEPS" = "ON"}