Skip to content

Modernize CURL in netCDF cmake #2904

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
Apr 3, 2024
Merged

Modernize CURL in netCDF cmake #2904

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
acec11d
Use modern cmake nomenclature for curl.
WardF Apr 3, 2024
19d6c02
Set flags to avoid warning messages if curl isn't found.
WardF Apr 3, 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
32 changes: 17 additions & 15 deletions cmake/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,25 +218,27 @@ endif(USE_HDF5)
################################
# See if we have libcurl
find_package(CURL)
target_compile_options(netcdf
PRIVATE
-DCURL_STATICLIB=1
)
target_include_directories(netcdf
#target_compile_options(netcdf
# PRIVATE
# -DCURL_STATICLIB=1
#)
#target_include_directories(netcdf
# PRIVATE
# ${CURL_INCLUDE_DIRS}
#)
if(CURL_FOUND)
set(FOUND_CURL TRUE)
target_link_libraries(netcdf
PRIVATE
${CURL_INCLUDE_DIRS}
CURL::libcurl
)



MESSAGE(STATUS "Found CURL_INCLUDE_DIRS: ${CURL_INCLUDE_DIRS}")
# Define a test flag for have curl library
if(CURL_LIBRARIES OR CURL_LIBRARY)
set(FOUND_CURL TRUE)
else()
set(FOUND_CURL FALSE)
endif()
set(FOUND_CURL ${FOUND_CURL} TRUE )
set(NETCDF_ENABLE_DAP2 OFF)
set(NETCDF_ENABLE_DAP4 OFF)
set(NETCDF_ENABLE_BYTERANGE OFF)
set(NETCDF_ENABLE_S3 OFF)
endif(CURL_FOUND)

# Start disabling if curl not found
if(NOT FOUND_CURL)
Expand Down
2 changes: 1 addition & 1 deletion libdap2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set_property(SOURCE ncd2dispatch.c
add_library(dap2 OBJECT ${dap2_SOURCES})


target_link_libraries(dap2 PUBLIC ${CURL_LIBRARIES})
target_link_libraries(dap2 PUBLIC CURL::libcurl ${CURL_LIBRARIES})
target_include_directories(dap2 PUBLIC ${CURL_INCLUDE_DIRS})
target_compile_options(dap2
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion libdap4/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set_property(SOURCE d4meta.c
SKIP_UNITY_BUILD_INCLUSION ON)

add_library(dap4 OBJECT ${dap4_SOURCES})
target_link_libraries(dap4 PUBLIC ${CURL_LIBRARIES})
target_link_libraries(dap4 PUBLIC CURL::libcurl ${CURL_LIBRARIES})
target_include_directories(dap4 PUBLIC ${CURL_INCLUDE_DIRS})
target_compile_options(dap4
PRIVATE
Expand Down
6 changes: 5 additions & 1 deletion liblib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ if(USE_HDF4)
)
endif()

if(FOUND_CURL)
target_link_libraries(netcdf PRIVATE CURL::libcurl)
endif()

if(NETCDF_ENABLE_DAP2)
target_sources(netcdf
PRIVATE
Expand Down Expand Up @@ -144,7 +148,7 @@ if(USE_HDF5)
endif()

if(FOUND_CURL)
set(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARIES})
set(TLL_LIBS ${TLL_LIBS} CURL::libcurl ${CURL_LIBRARIES})
endif()

if(USE_HDF4)
Expand Down
2 changes: 2 additions & 0 deletions libsrc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ ENDif (USE_FFIO)

if (NETCDF_ENABLE_BYTERANGE)
list(APPEND libsrc_SOURCES httpio.c)

if (NETCDF_ENABLE_S3)
list(APPEND libsrc_SOURCES s3io.c)
endif(NETCDF_ENABLE_S3)
Expand All @@ -55,6 +56,7 @@ endif()

if (NETCDF_ENABLE_BYTERANGE)
target_include_directories(netcdf3 PUBLIC ${CURL_INCLUDE_DIRS})
target_link_libraries(netcdf3 PUBLIC CURL::libcurl)
target_compile_options(netcdf3
PRIVATE
-DCURL_STATICLIB=1
Expand Down
2 changes: 1 addition & 1 deletion oc2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif()
if(STATUS_PARALLEL)
target_link_libraries(oc2 PUBLIC MPI::MPI_C)
endif(STATUS_PARALLEL)
target_link_libraries(oc2 PUBLIC ${CURL_LIBRARIES})
target_link_libraries(oc2 PUBLIC CURL::libcurl ${CURL_LIBRARIES})
target_include_directories(oc2 PUBLIC ${CURL_INCLUDE_DIRS})
target_compile_options(oc2
PRIVATE
Expand Down