Merge pull request #1 from Microsoft/master

Update vcpkg from upstream

4 files changed, 32 insertions, 24 deletions

diff --git a/ports/szip/CONTROL b/ports/szip/CONTROL
index acc364810..ca2093d66 100644
--- a/ports/szip/CONTROL
+++ b/ports/szip/CONTROL
@@ -1,3 +1,3 @@
 Source: szip
-Version: 2.1-1
+Version: 2.1.1-1
 Description: Szip compression software, providing lossless compression of scientific data
diff --git a/ports/szip/disable-static-lib-in-shared-build.patch b/ports/szip/disable-static-lib-in-shared-build.patch
index f06e6dcf6..02110cb2a 100644
--- a/ports/szip/disable-static-lib-in-shared-build.patch
+++ b/ports/szip/disable-static-lib-in-shared-build.patch
@@ -1,5 +1,5 @@
---- a/src/CMakeLists.txt	Mon Aug 03 17:10:33 2015
-+++ b/src/CMakeLists.txt	Fri Jan 13 09:38:07 2017
+--- a/src/CMakeLists.txt	Fri Feb 03 20:42:43 2017
++++ b/src/CMakeLists.txt	Wed Jan 03 11:42:51 2018
 @@ -22,20 +22,22 @@
      ${SZIP_SRC_SOURCE_DIR}/szlib.h
  )
@@ -37,3 +37,14 @@
  
  if (BUILD_SHARED_LIBS)
    add_library (${SZIP_LIBSH_TARGET} SHARED ${SZIP_SRCS} ${SZIP_PUBLIC_HEADERS})
+@@ -62,8 +64,9 @@
+ if (SZIP_EXPORTED_TARGETS)
+   if (BUILD_SHARED_LIBS)
+     INSTALL_TARGET_PDB (${SZIP_LIBSH_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries)
++  else()
++    INSTALL_TARGET_PDB (${SZIP_LIB_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries)
+   endif (BUILD_SHARED_LIBS)
+-  INSTALL_TARGET_PDB (${SZIP_LIB_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries)
+ 
+   install (
+       TARGETS
diff --git a/ports/szip/fix-szip-config-to-set-szip-found.patch b/ports/szip/fix-szip-config-to-set-szip-found.patch
new file mode 100644
index 000000000..f662916f9
--- /dev/null
+++ b/ports/szip/fix-szip-config-to-set-szip-found.patch
@@ -0,0 +1,11 @@
+diff -urN szip-2.1.1-a/config/cmake/szip-config.cmake.in szip-2.1.1-b/config/cmake/szip-config.cmake.in
+--- szip-2.1.1-a/config/cmake/szip-config.cmake.in	2018-02-10 11:06:46.890685077 +0900
++++ szip-2.1.1-b/config/cmake/szip-config.cmake.in	2018-02-10 11:11:25.369274127 +0900
+@@ -51,6 +51,7 @@
+       set (${SZIP_PACKAGE_NAME}_${comp}_FOUND 0)
+     else ()
+       set (${SZIP_PACKAGE_NAME}_${comp}_FOUND 1)
++      set (${SZIP_PACKAGE_NAME}_FOUND 1)
+       string(TOUPPER ${SZIP_PACKAGE_NAME}_${comp}_LIBRARY COMP_LIBRARY)
+       set (${COMP_LIBRARY} ${${COMP_LIBRARY}} @SZIP_LIB_CORENAME@-${comp})
+     endif ()
diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake
index 957d91ea1..c98f0e025 100644
--- a/ports/szip/portfile.cmake
+++ b/ports/szip/portfile.cmake
@@ -1,31 +1,19 @@
 include(vcpkg_common_functions)
 
-# set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/szip-2.1)
-# vcpkg_download_distfile(ARCHIVE
-#     URLS "https://support.hdfgroup.org/ftp/lib-external/szip/2.1/src/szip-2.1.tar.gz"
-#     FILENAME "szip-2.1.tar.gz"
-#     SHA512 ea91b877bb061fe6c96988a3c4b705e101a6950e34e9be53d6a57455c6a625be0afa60f4a3cfdd09649205b9f8586cc25ea60fe07a8131579acf3826b35fb749
-# )
-# vcpkg_extract_source_archive(${ARCHIVE})
-
-# NOTE: We use Szip from the HDF5 cmake package dir, because it includes a lot of fixes for the CMake build files
-
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CMake-hdf5-1.10.0-patch1)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/szip-2.1.1)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://hdf4.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.0-patch1/src/CMake-hdf5-1.10.0-patch1.zip"
-    FILENAME "CMake-hdf5-1.10.0-patch1.zip"
-    SHA512 ec2edb43438661323be5998ecf64c4dd537ddc7451e31f89390260d16883e60a1ccc1bf745bcb809af22f2bf7157d50331a33910b8ebf5c59cd50693dfb2ef8f
+    URLS "https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz"
+    FILENAME "szip-2.1.1.tar.gz"
+    SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd
 )
 vcpkg_extract_source_archive(${ARCHIVE})
-set(ARCHIVE ${SOURCE_PATH}/SZip.tar.gz)
-vcpkg_extract_source_archive(${ARCHIVE})
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/Szip)
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES
         ${CMAKE_CURRENT_LIST_DIR}/disable-static-lib-in-shared-build.patch
         ${CMAKE_CURRENT_LIST_DIR}/default-component-shared.patch
+        ${CMAKE_CURRENT_LIST_DIR}/fix-szip-config-to-set-szip-found.patch
 )
 
 vcpkg_configure_cmake(
@@ -38,11 +26,9 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/szip/data/COPYING ${CURRENT_PACKAGES_DIR}/share/szip/copyright)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/szip)
 
-file(READ ${CURRENT_PACKAGES_DIR}/debug/share/szip/szip-targets-debug.cmake SZIP_TARGETS_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" SZIP_TARGETS_DEBUG_MODULE "${SZIP_TARGETS_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/szip/szip-targets-debug.cmake "${SZIP_TARGETS_DEBUG_MODULE}")
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/szip/data/COPYING ${CURRENT_PACKAGES_DIR}/share/szip/copyright)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)