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

Author: ChrisBarker-NOAA

CMakeLists.txt

@@ -5,35 +5,18 @@ find_package(
   Python
   COMPONENTS Interpreter Development.Module NumPy
   REQUIRED)
-include(UseCython)
-
-# FetchContent_Declare(
-#   gd
-#   URL https://github.com/libgd/libgd/releases/download/gd-2.3.3/
-#   URL_HASH stuff
-# )
 
-# FetchContent_MakeAvailable(gd)
+include(UseCython)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+find_package(GD MODULE REQUIRED)
 
-find_package(GD
-             MODULE
-             REQUIRED
-             )
-cython_transpile(py_gd/py_gd.pyx
-   LANGUAGE C
-   OUTPUT_VARIABLE py_gd_c)
-
+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)
 install(TARGETS spline DESTINATION py_gd)

cmake/FindGD.cmake

@@ -1,15 +1,23 @@
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_GD QUIET GD)
+endif()
 
-find_path (GD_INCLUDE_DIR
-           "gd.h"
-           REQUIRED)
+find_path(GD_INCLUDE_DIR
+  NAMES gd.h
+  HINTS "${PC_GD_INCLUDE_DIRS}"
+  REQUIRED
+)
 
-find_library (GD_LIBRARY
-              gd
-              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}")
 
@@ -24,13 +32,16 @@ find_package_handle_standard_args(GD
 if(GD_FOUND)
   set(GD_LIBRARIES "${GD_LIBRARY}")
   set(GD_INCLUDE_DIRS "${GD_INCLUDE_DIR}")
+  set(Foo_DEFINITIONS ${PC_GD_CFLAGS_OTHER})
 endif()
 
 if(GD_FOUND AND NOT TARGET GD::GD)
   add_library(GD::GD UNKNOWN IMPORTED)
   set_target_properties(GD::GD PROPERTIES
     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

@@ -51,7 +51,7 @@ linux.before-all = [
    "dnf install -y gd-devel",
 ]
 windows.before-all = [
-   "vcpkg install libgd",
+   "vcpkg install libgd pkgconf",
 ]
 macos.before-all = [
   "git clone https://github.com/libgd/libgd.git --branch gd-2.3.3 --depth 1",