Skip to content

Commit 0b326fd

Browse files
authored
Merge pull request #19 from jedwards4b/add_pkg_config
remove custom netcdf find function
2 parents fec7c42 + 0784ad1 commit 0b326fd

5 files changed

+7
-676
lines changed

CMakeLists.txt

+7-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ endif()
77
project (cprnc Fortran C)
88
include (CheckFunctionExists)
99
include (ExternalProject)
10+
find_package(PkgConfig REQUIRED)
1011

1112
#===== Local modules =====
1213
list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@@ -74,17 +75,20 @@ foreach (SRC_FILE IN LISTS CPRNC_GenF90_SRCS)
7475
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_FILE}.in genf90)
7576
endforeach ()
7677

78+
#===== NetCDF =====
79+
pkg_check_modules(NetCDF REQUIRED IMPORTED_TARGET netcdf)
80+
7781
#===== NetCDF-Fortran =====
78-
INCLUDE(FindNetCDF)
82+
pkg_check_modules(NetCDF_Fortran REQUIRED IMPORTED_TARGET netcdf-fortran)
7983
add_executable (cprnc ${CPRNC_Fortran_SRCS} ${CPRNC_GenF90_SRCS})
80-
target_include_directories(cprnc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${NetCDF_Fortran_INCLUDE_DIRS})
84+
target_include_directories(cprnc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
8185

8286
add_dependencies (cprnc genf90)
8387

8488
# Always use -fPIC
8589
set_property(TARGET cprnc PROPERTY POSITION_INDEPENDENT_CODE ON)
8690
target_link_libraries (cprnc
87-
PUBLIC ${NetCDF_Fortran_LIBRARIES} ${NetCDF_C_LIBRARIES} ${NetCDF_LIBRARIES})
91+
PUBLIC PkgConfig::NetCDF_Fortran PkgConfig::NetCDF)
8892

8993
# We do not want cprnc injecting ctests into parent projects
9094
if (CPRNC_STANDALONE)

cmake/FindNetCDF.cmake

-96
This file was deleted.

cmake/FindNetCDF.cmake~

-143
This file was deleted.

cmake/LibCheck.cmake

-104
This file was deleted.

0 commit comments

Comments
 (0)