Merge branch 'sonogi1-master'

ports/gdcm2/CONTROL

@@ -0,0 +1,4 @@
+Source: gdcm2
+Version: 2.6.7
+Description: Grassroots DICOM library
+Build-Depends: zlib, expat

ports/gdcm2/gdcm-include-dir.patch

@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -409,6 +409,7 @@
+ if(GDCM_USE_SYSTEM_ZLIB)
+   # If user say so, then this is a requirement !
+   find_package(ZLIB REQUIRED)
++  include_directories(${ZLIB_INCLUDE_DIR})
+   set(GDCM_ZLIB_LIBRARIES ${ZLIB_LIBRARIES})
+ else()
+   set(GDCM_ZLIB_LIBRARIES "gdcmzlib")

ports/gdcm2/portfile.cmake

@@ -0,0 +1,43 @@
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gdcm-2.6.7)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://downloads.sourceforge.net/project/gdcm/gdcm 2.x/GDCM 2.6.7/gdcm-2.6.7.tar.gz"
+    FILENAME "gdcm-2.6.7.tar.gz"
+    SHA512 2eefad47e4d36038db8d120a91dc0a40816d045e3562c711b6dba7aec5788d4b08a00966bf4c82dc354cb1aa654bff4200afff022a42f2ab58bf7baafe69ff05
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/gdcm-include-dir.patch"
+)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(GDCM_BUILD_SHARED_LIBS ON)
+else()
+    set(GDCM_BUILD_SHARED_LIBS OFF)
+endif()
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+	# PREFER_NINJA # Disable this option if project cannot be built with Ninja
+	OPTIONS
+		-DGDCM_BUILD_DOCBOOK_MANPAGES=OFF
+		-DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS}
+		-DGDCM_USE_SYSTEM_EXPAT=ON
+		-DGDCM_USE_SYSTEM_ZLIB=ON
+		${ADDITIONAL_OPTIONS}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE
+	${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdcm2 RENAME copyright)
+
+vcpkg_copy_pdbs()