Merge pull request #19 from jedwards4b/add_pkg_config

remove custom netcdf find function
ESMCI · Dec 4, 2024 · 0b326fd · 0b326fd
2 parents fec7c42 + 0784ad1
commit 0b326fd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 676 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,7 @@ endif()
 project (cprnc Fortran C)
 include (CheckFunctionExists)
 include (ExternalProject)
+find_package(PkgConfig REQUIRED)
 
 #===== Local modules =====
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@@ -74,17 +75,20 @@ foreach (SRC_FILE IN LISTS CPRNC_GenF90_SRCS)
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_FILE}.in genf90)
 endforeach ()
 
+#===== NetCDF =====
+pkg_check_modules(NetCDF REQUIRED IMPORTED_TARGET netcdf)
+
 #===== NetCDF-Fortran =====
-INCLUDE(FindNetCDF)
+pkg_check_modules(NetCDF_Fortran REQUIRED IMPORTED_TARGET netcdf-fortran)
 add_executable (cprnc ${CPRNC_Fortran_SRCS} ${CPRNC_GenF90_SRCS})
-target_include_directories(cprnc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${NetCDF_Fortran_INCLUDE_DIRS})
+target_include_directories(cprnc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_dependencies (cprnc genf90)
 
 # Always use -fPIC
 set_property(TARGET cprnc PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_link_libraries (cprnc
-    PUBLIC ${NetCDF_Fortran_LIBRARIES} ${NetCDF_C_LIBRARIES} ${NetCDF_LIBRARIES})
+    PUBLIC PkgConfig::NetCDF_Fortran PkgConfig::NetCDF)
 
 # We do not want cprnc injecting ctests into parent projects
 if (CPRNC_STANDALONE)

diff --git a/cmake/FindNetCDF.cmake b/cmake/FindNetCDF.cmake
diff --git a/cmake/FindNetCDF.cmake~ b/cmake/FindNetCDF.cmake~
diff --git a/cmake/LibCheck.cmake b/cmake/LibCheck.cmake