diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,22 +262,13 @@ ### NETCDF (optional) ############################# IF (ENABLE_NETCDF) -FIND_LIBRARY (NETCDF_LIBRARY netcdf - PATHS - /usr/lib - /usr/local/lib +FIND_PACKAGE(netCDF) +SET_PACKAGE_PROPERTIES(netCDF PROPERTIES + DESCRIPTION "Interfaces for array-oriented data access" + URL "https://www.unidata.ucar.edu/software/netcdf/" ) -FIND_PATH (NETCDF_INCLUDE_DIR netcdf.h - /usr/include - /usr/local/include -) -IF (NETCDF_LIBRARY AND NETCDF_INCLUDE_DIR) - SET (NETCDF_FOUND TRUE) -ELSE () - SET (NETCDF_FOUND FALSE) -ENDIF () -IF (NETCDF_FOUND) - MESSAGE (STATUS "Found Network Common Data Format (NetCDF) Library: ${NETCDF_INCLUDE_DIR} ${NETCDF_LIBRARY}") +IF (netCDF_FOUND) + MESSAGE (STATUS "Found Network Common Data Format (NetCDF) Library") add_definitions (-DHAVE_NETCDF) ELSE () MESSAGE (STATUS "Network Common Data Format (NetCDF) Library NOT FOUND") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -404,8 +404,8 @@ IF (FFTW3_FOUND) target_link_libraries( labplot2lib ${FFTW3_LIBRARIES} ) ENDIF () -IF (NETCDF_FOUND) - target_link_libraries( labplot2lib ${NETCDF_LIBRARY} ) +IF (netCDF_FOUND) + target_link_libraries( labplot2lib netcdf ) ENDIF () IF (CFITSIO_FOUND) target_link_libraries( labplot2lib ${CFITSIO_LIBRARIES} ) diff --git a/tests/import_export/ASCII/CMakeLists.txt b/tests/import_export/ASCII/CMakeLists.txt --- a/tests/import_export/ASCII/CMakeLists.txt +++ b/tests/import_export/ASCII/CMakeLists.txt @@ -20,8 +20,8 @@ IF (FFTW3_FOUND) target_link_libraries(asciifiltertest ${FFTW3_LIBRARIES} ) ENDIF () -IF (NETCDF_FOUND) - target_link_libraries(asciifiltertest ${NETCDF_LIBRARY} ) +IF (netCDF_FOUND) + target_link_libraries(asciifiltertest netcdf ) ENDIF () IF (CFITSIO_FOUND) target_link_libraries(asciifiltertest ${CFITSIO_LIBRARIES} ) diff --git a/tests/import_export/JSON/CMakeLists.txt b/tests/import_export/JSON/CMakeLists.txt --- a/tests/import_export/JSON/CMakeLists.txt +++ b/tests/import_export/JSON/CMakeLists.txt @@ -20,8 +20,8 @@ IF (FFTW3_FOUND) target_link_libraries(jsonfiltertest ${FFTW3_LIBRARIES} ) ENDIF () -IF (NETCDF_FOUND) - target_link_libraries(jsonfiltertest ${NETCDF_LIBRARY} ) +IF (netCDF_FOUND) + target_link_libraries(jsonfiltertest netcdf ) ENDIF () IF (CFITSIO_FOUND) target_link_libraries(jsonfiltertest ${CFITSIO_LIBRARIES} ) diff --git a/tests/import_export/MQTT/CMakeLists.txt b/tests/import_export/MQTT/CMakeLists.txt --- a/tests/import_export/MQTT/CMakeLists.txt +++ b/tests/import_export/MQTT/CMakeLists.txt @@ -22,8 +22,8 @@ IF (FFTW3_FOUND) target_link_libraries(mqttunittest ${FFTW3_LIBRARIES} ) ENDIF () -IF (NETCDF_FOUND) - target_link_libraries(mqttunittest ${NETCDF_LIBRARY} ) +IF (netCDF_FOUND) + target_link_libraries(mqttunittest netcdf ) ENDIF () IF (CFITSIO_FOUND) target_link_libraries(mqttunittest ${CFITSIO_LIBRARIES} ) diff --git a/tests/import_export/project/CMakeLists.txt b/tests/import_export/project/CMakeLists.txt --- a/tests/import_export/project/CMakeLists.txt +++ b/tests/import_export/project/CMakeLists.txt @@ -20,8 +20,8 @@ IF (FFTW3_FOUND) target_link_libraries(projectimporttest ${FFTW3_LIBRARIES} ) ENDIF () -IF (NETCDF_FOUND) - target_link_libraries(projectimporttest ${NETCDF_LIBRARY} ) +IF (netCDF_FOUND) + target_link_libraries(projectimporttest netcdf ) ENDIF () IF (CFITSIO_FOUND) target_link_libraries(projectimporttest ${CFITSIO_LIBRARIES} )