move to own git serverHEADmaster

1 files changed, 130 insertions, 0 deletions

diff --git a/vcpkg/ports/netcdf-c/use_targets.patch b/vcpkg/ports/netcdf-c/use_targets.patch
new file mode 100644
index 0000000..4124c9a
--- /dev/null
+++ b/vcpkg/ports/netcdf-c/use_targets.patch
@@ -0,0 +1,130 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dac5992..09910b1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -484,7 +484,6 @@ IF(NC_EXTRA_DEPS)
+     ENDIF()
+     SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}")
+   ENDFOREACH()
+-  MESSAGE("Extra deps: ${EXTRA_DEPS}")
+   LIST(REMOVE_DUPLICATES EXTRA_DEPS)
+   SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS})
+ ENDIF()
+@@ -721,15 +720,6 @@ IF(USE_HDF5)
+     # we will use a static library.  This can be toggled
+     # by explicitly modifying NC_FIND_SHARED_LIBS.
+     ##
+-    IF(NC_FIND_SHARED_LIBS)
+-      SET(NC_HDF5_LINK_TYPE "shared")
+-      SET(NC_HDF5_LINK_TYPE_UPPER "SHARED")
+-      ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)
+-    ELSE(NC_FIND_SHARED_LIBS)
+-      SET(NC_HDF5_LINK_TYPE "static")
+-      SET(NC_HDF5_LINK_TYPE_UPPER "STATIC")
+-      ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)
+-    ENDIF(NC_FIND_SHARED_LIBS)
+ 
+     #####
+     # First, find the C and HL libraries.
+@@ -742,7 +732,7 @@ IF(USE_HDF5)
+       SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})
+       FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE})
+     ELSE(MSVC)
+-      FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
++      FIND_PACKAGE(HDF5 COMPONENTS C HL CONFIG REQUIRED)
+     ENDIF(MSVC)
+ 
+     ##
+@@ -857,6 +847,19 @@ IF(USE_HDF5)
+ 
+   ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR)
+ 
++  if(TARGET hdf5::hdf5-shared)
++    set(HDF5_C_LIBRARY hdf5::hdf5-shared)
++    set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared)
++    set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared)
++    ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)
++  else()
++    set(HDF5_C_LIBRARY hdf5::hdf5-static)
++    set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static)
++    set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static)
++    ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)
++  endif()
++  list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY})
++
+   FIND_PACKAGE(Threads)
+ 
+   # There is a missing case in the above code so default it
+@@ -985,11 +988,14 @@ ENDIF(USE_HDF5)
+ 
+ # See if we have libcurl
+ FIND_PACKAGE(CURL)
+-ADD_DEFINITIONS(-DCURL_STATICLIB=1)
+ INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+ 
+ # Define a test flag for have curl library
+-IF(CURL_LIBRARIES OR CURL_LIBRARY)
++IF(CURL_FOUND)
++  SET(CURL_LIBRARY CURL::libcurl)
++  if(CURL_VERSION VERSION_GREATER_EQUAL "7.66")
++    set(HAVE_LIBCURL_766 TRUE CACHE INTERNAL "vcpkg")
++  endif()
+   SET(FOUND_CURL TRUE)
+ ELSE()
+   SET(FOUND_CURL FALSE)
+@@ -2464,10 +2470,9 @@ IF(NC_LIBS)
+   STRING(REPLACE "-lhdf5::hdf5_hl-static" "-lhdf5_hl" NC_LIBS ${NC_LIBS})
+ ENDIF()
+ 
+-STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}")
+-
+-LIST(REMOVE_DUPLICATES NC_LIBS)
++LIST(REMOVE_ITEM LINKFLAGS "-L")
+ LIST(REMOVE_DUPLICATES LINKFLAGS)
++STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}")
+ 
+ SET(LIBS ${NC_LIBS})
+ SET(NC_LIBS "-lnetcdf")
+diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt
+index 5e1692f..882f1dd 100644
+--- a/liblib/CMakeLists.txt
++++ b/liblib/CMakeLists.txt
+@@ -77,6 +77,12 @@ IF(HAVE_LIBDL)
+ ENDIF()
+ 
+ IF(USE_HDF5)
++  if(TARGET hdf5::hdf5-shared)
++    SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared)
++  else()
++    SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static)
++  endif()
++elseif(0)
+   IF(NOT MSVC)
+     # Some version of cmake define HDF5_hdf5_LIBRARY instead of
+     # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES
+@@ -118,7 +124,6 @@ IF(ENABLE_S3_SDK)
+ ENDIF()
+ 
+ IF(TLL_LIBS)
+-  LIST(REMOVE_DUPLICATES TLL_LIBS)
+ ENDIF()
+ 
+ TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS})
+diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in
+index 9d68eec..715e33e 100644
+--- a/netCDFConfig.cmake.in
++++ b/netCDFConfig.cmake.in
+@@ -12,6 +12,13 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+ set(netCDF_LIBRARIES netCDF::netcdf)
+ 
+ # include target information
++include(CMakeFindDependencyMacro)
++if("@USE_HDF5@")
++  find_dependency(HDF5 CONFIG)
++endif()
++if("@FOUND_CURL@")
++  find_dependency(CURL CONFIG)
++endif()
+ include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake")
+ 
+ # Compiling Options