From fd6421d5c907bc9c0df6c234003b61d8fdcc9c45 Mon Sep 17 00:00:00 2001
From: Peter Hill <peter.hill@york.ac.uk>
Date: Wed, 17 Jan 2024 17:17:59 +0000
Subject: [PATCH] CMake: Don't use `include_directories` for pnetcdf

---
 cmake/dependencies.cmake   | 1 -
 libdispatch/CMakeLists.txt | 4 ++++
 liblib/CMakeLists.txt      | 5 ++---
 libsrcp/CMakeLists.txt     | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 6ea3bc4c0d..a2aef770e8 100644
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -632,7 +632,6 @@ ENDIF(ENABLE_LIBXML2)
 ################################ 
 IF(ENABLE_PNETCDF)
   find_package(PNETCDF 1.6.0 REQUIRED)
-  include_directories(${PNETCDF_INCLUDE_DIR})
 ENDIF()
 
 ################################
diff --git a/libdispatch/CMakeLists.txt b/libdispatch/CMakeLists.txt
index 1d867369b8..e0ce0601d7 100644
--- a/libdispatch/CMakeLists.txt
+++ b/libdispatch/CMakeLists.txt
@@ -36,6 +36,10 @@ IF(STATUS_PARALLEL)
     target_link_libraries(dispatch PUBLIC MPI::MPI_C)
 ENDIF(STATUS_PARALLEL)
 
+if (ENABLE_PNETCDF)
+    target_link_libraries(dispatch PUBLIC pnetcdf::pnetcdf)
+endif()
+
 IF(ENABLE_NCZARR)
     target_include_directories(dispatch PUBLIC ../libnczarr)
 ENDIF(ENABLE_NCZARR)
diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt
index 4e54e00815..14227738ae 100644
--- a/liblib/CMakeLists.txt
+++ b/liblib/CMakeLists.txt
@@ -139,11 +139,10 @@ IF(USE_HDF4)
   SET(TLL_LIBS ${HDF4_MFHDF_LIB} ${HDF4_DF_LIB} ${TLL_LIBS})
 ENDIF()
 
-IF(ENABLE_PNETCDF AND PNETCDF)
-  SET(TLL_LIBS ${TLL_LIBS} ${PNETCDF})
+IF(ENABLE_PNETCDF)
+  SET(TLL_LIBS ${TLL_LIBS} pnetcdf::pnetcdf)
 ENDIF()
 
-
 IF(ENABLE_S3)
   IF(ENABLE_S3_AWS)
     TARGET_LINK_DIRECTORIES(netcdf PUBLIC ${AWSSDK_LIB_DIR})
diff --git a/libsrcp/CMakeLists.txt b/libsrcp/CMakeLists.txt
index adf1d34136..f9e5c52c31 100644
--- a/libsrcp/CMakeLists.txt
+++ b/libsrcp/CMakeLists.txt
@@ -8,5 +8,6 @@
 SET(libsrcp_SOURCES ncpdispatch.c)
 
 add_library(netcdfp OBJECT ${libsrcp_SOURCES})
+target_link_libraries(netcdfp PUBLIC pnetcdf::pnetcdf)
 
 ADD_EXTRA_DIST(${libsrcp_SOURCES} CMakeLists.txt)