Skip to content

remove custom netcdf find function #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 4, 2024
Merged

remove custom netcdf find function #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa631bc
remove custom netcdf find function
jedwards4b Dec 4, 2024
0784ad1
more changes suggested by hammpie
jedwards4b Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Copy link

@climbfuji climbfuji Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work with static libraries?

https://github.com/NOAA-EMC/CMakeModules/blob/9b7652c75b40d9cbb40e52b824f8c0a423922757/Modules/FindNetCDF.cmake#L232


#===== 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)
Expand Down
96 changes: 0 additions & 96 deletions cmake/FindNetCDF.cmake
View file
Open in desktop

This file was deleted.

143 changes: 0 additions & 143 deletions cmake/FindNetCDF.cmake~
View file
Open in desktop

This file was deleted.

104 changes: 0 additions & 104 deletions cmake/LibCheck.cmake
View file
Open in desktop

This file was deleted.

Loading
Loading