moved finding the gd lib to separate module

Author: ChrisBarker-NOAA

CMakeLists.txt

@@ -15,25 +15,20 @@ include(UseCython)
 
 # FetchContent_MakeAvailable(gd)
 
-find_library (libgd
-              gd
-              REQUIRED
-              )
-message (STATUS "libgd found at ${libgd}")
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake"
+    )
 
-find_path (gd_include_path
-           "gd.h"
-           REQUIRED)
-
-message (STATUS "gd.h found at ${gd_include_path}")
+find_package(GD
+             MODULE
+             REQUIRED
+             )
 
 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 "${libgd}" Python::NumPy)
-target_include_directories(py_gd PUBLIC "${gd_include_path}")
+target_link_libraries(py_gd PUBLIC GD::GD Python::NumPy)
 install(TARGETS py_gd DESTINATION py_gd)
 
 

cmake/FindGD.cmake

@@ -0,0 +1,38 @@
+
+find_path (GD_INCLUDE_DIR
+           "gd.h"
+           REQUIRED)
+
+find_library (GD_LIBRARY
+              gd
+              REQUIRED
+              )
+
+message (STATUS "libgd found at ${GD_LIBRARY}, ${GD_INCLUDE_DIR}")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GD
+  REQUIRED_VARS
+    GD_LIBRARY
+    GD_INCLUDE_DIR
+  VERSION_VAR GD_VERSION
+)
+
+if(GD_FOUND)
+  set(GD_LIBRARIES "${GD_LIBRARY}")
+  set(GD_INCLUDE_DIRS "${GD_INCLUDE_DIR}")
+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_INCLUDE_DIRECTORIES "${GD_INCLUDE_DIR}"
+  )
+endif()
+
+mark_as_advanced(
+  GD_INCLUDE_DIR
+  GD_LIBRARY
+)
+

py_gd/__init__.py

@@ -13,7 +13,7 @@
 import sys
 import os
 
-__version__ = "2.3.2"
+__version__ = "2.3.3"
 
 if sys.platform.startswith('win'):
     # This only works for Anaconda / miniconda