From 8f2b4f2b34b00841b44ebacd63f81e7af8947f98 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Sat, 16 May 2020 13:49:25 +0100 Subject: [PATCH] CMake: Use namespaced target name for netCDF-C library --- CMakeLists.txt | 6 +++--- cxx4/CMakeLists.txt | 2 +- netCDFCxxConfig.cmake.in | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e52b0c..2f64384 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -376,9 +376,9 @@ ELSE() ENDIF() -if (NOT TARGET netcdf) - add_library(netcdf UNKNOWN IMPORTED) - set_target_properties(netcdf PROPERTIES +if (NOT TARGET netCDF::netcdf) + add_library(netCDF::netcdf UNKNOWN IMPORTED) + set_target_properties(netCDF::netcdf PROPERTIES IMPORTED_LOCATION "${NETCDF_C_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${NETCDF_C_INCLUDE_DIR}" ) diff --git a/cxx4/CMakeLists.txt b/cxx4/CMakeLists.txt index c375553..f921005 100644 --- a/cxx4/CMakeLists.txt +++ b/cxx4/CMakeLists.txt @@ -33,7 +33,7 @@ TARGET_INCLUDE_DIRECTORIES(netcdf-cxx4 PUBLIC $ $ ) -TARGET_LINK_LIBRARIES(netcdf-cxx4 PUBLIC netcdf) +TARGET_LINK_LIBRARIES(netcdf-cxx4 PUBLIC netCDF::netcdf) TARGET_LINK_LIBRARIES(netcdf-cxx4 PUBLIC ${ALL_TLL_LIBS}) target_include_directories(netcdf-cxx4 SYSTEM PUBLIC "${HDF5_C_INCLUDE_DIRS}") diff --git a/netCDFCxxConfig.cmake.in b/netCDFCxxConfig.cmake.in index edf6ee2..e51606c 100644 --- a/netCDFCxxConfig.cmake.in +++ b/netCDFCxxConfig.cmake.in @@ -18,9 +18,9 @@ else() set(NETCDF_C_INCLUDE_DIR "@NETCDF_C_INCLUDE_DIR@") endif() -if (NOT TARGET netcdf) - add_library(netcdf UNKNOWN IMPORTED) - set_target_properties(netcdf PROPERTIES +if (NOT TARGET netCDF::netcdf) + add_library(netCDF::netcdf UNKNOWN IMPORTED) + set_target_properties(netCDF::netcdf PROPERTIES IMPORTED_LOCATION "${NETCDF_C_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${NETCDF_C_INCLUDE_DIR}" )