diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ff8e9ee33eff7c4d58c4c67a4a341a82b417ef80..fca6176d99eb0e940133d841a51a05d6c281be2a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -197,9 +197,7 @@ add_library(cdilib
   ${cdi_src_files} ${cdi_unknown}
 #  INSTALL_HEADERS_LIST  cdi.h
 )
-if(${eccodes_FOUND})
-  target_link_libraries(cdilib eccodes ${netcdf_LIBS})
-endif()
+target_link_libraries(cdilib eccodes ${netCDF_LIBRARIES})
 target_compile_definitions(cdilib PRIVATE CDI=1)
 target_compile_definitions(cdilib PRIVATE PACKAGE_NAME="cdilib")
 target_compile_definitions(cdilib PRIVATE VERSION="${CMAKE_PROJECT_VERSION}")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 035ca3c044407b5fd3a7818c97ed6c67dbff9568..cf18bbac6f3fe2a57236f2f68722ee26ea97c9a2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -35,7 +35,7 @@ target_link_libraries(test_lib PRIVATE cdilib eccodes)
 
 foreach(target ${current_targets})
   target_include_directories(${target} PRIVATE ../src/)
-  target_link_libraries(${target} PRIVATE cdilib test_lib netcdf)
+  target_link_libraries(${target} PRIVATE cdilib test_lib ${netCDF_LIBRARIES} )
   add_test(NAME ${target} COMMAND ${target})
   if(labels_${target})
     set_property(TEST ${target} PROPERTY LABELS labels_${target})