From 050e71d01dc9e65e6cdf1d13534fc14889e4ae38 Mon Sep 17 00:00:00 2001
From: Victor Romero <romerosanchezv@gmail.com>
Date: Thu, 2 May 2019 22:57:43 -0700
Subject: Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)

* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

* [alac,benchmark,capnproto] Fix  check_linkage call

* [fastlz] Fix SHA512

* [coroutine] Fix dynamic build

* [folly] Find double-conversion

* [gamma] Use vcpkg_from_github

* [librsync] Enable static builds

* [netcdf-cxx4] Fix SHA512

* [octomap] Fix static build

* [tidy-html5] Fix static build

* [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime

* [folly] Use ras0219's fix for link paths

* [octomap] Fix exported targets

* [uvatlas] Set tool download SHA512

* [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32

* [suitesparse] osx fix

* [gtkmm] Call vcpkg_check_linkage after including vcpkg functions

* [duktape] Resolve conflicts

* [duktape] FIxed typo in Python paths

* [wangle] Find zlib

* [openssl-uwp] Fix SHA512

* [glib] Allow static builds on non-Windows

* [suitesparse] Fix build on Windows

* [multiple ports] Bump CONTROL version

* [multiple ports] Fix description indent

* [directxtk] Fix CONTROL file

* [bde,duktape,qpid-proton] Build packages with python2 installed

* [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

* [gdal,live555,uriparser] Fix regressions

* [live555] Update to 2019.04.24
---
 ports/dcmtk/CONTROL        |  2 +-
 ports/dcmtk/portfile.cmake | 95 ++++++++++++++++++++++------------------------
 2 files changed, 47 insertions(+), 50 deletions(-)

(limited to 'ports/dcmtk')

diff --git a/ports/dcmtk/CONTROL b/ports/dcmtk/CONTROL
index 2ef092eba..ab248db1c 100644
--- a/ports/dcmtk/CONTROL
+++ b/ports/dcmtk/CONTROL
@@ -1,3 +1,3 @@
 Source: dcmtk
-Version: 3.6.3
+Version: 3.6.3-1
 Description: This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.
diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake
index f93c3f408..d11878a0e 100644
--- a/ports/dcmtk/portfile.cmake
+++ b/ports/dcmtk/portfile.cmake
@@ -1,49 +1,46 @@
-include(vcpkg_common_functions)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message("DCMTK only supports static library linkage")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO DCMTK/dcmtk
-    REF DCMTK-3.6.3
-    SHA512 5863d0c05f046075b998bced7c8c71bf8e969dd366f26d48cdf26012ea744ae4a22784a5c3c12e12b0f188e997c93a6890ef0c3c336865ea93f13c45f70b258d
-    HEAD_REF master
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DDCMTK_WITH_DOXYGEN=OFF
-        -DDCMTK_WITH_ZLIB=OFF
-        -DDCMTK_WITH_OPENSSL=OFF
-        -DDCMTK_WITH_PNG=OFF
-        -DDCMTK_WITH_TIFF=OFF
-        -DDCMTK_WITH_XML=OFF
-        -DDCMTK_WITH_ICONV=OFF
-        -DDCMTK_FORCE_FPIC_ON_UNIX=ON
-        -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF
-        -DDCMTK_ENABLE_BUILTIN_DICTIONARY=ON
-        -DDCMTK_ENABLE_PRIVATE_TAGS=ON
-        -DBUILD_APPS=OFF
-        -DDCMTK_ENABLE_CXX11=ON
-        -DCMAKE_DEBUG_POSTFIX="d"
-    OPTIONS_DEBUG
-        -DINSTALL_HEADERS=OFF
-        -DINSTALL_OTHER=OFF
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-vcpkg_fixup_cmake_targets()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/dcmtk RENAME copyright)
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DCMTK/dcmtk
+    REF DCMTK-3.6.3
+    SHA512 5863d0c05f046075b998bced7c8c71bf8e969dd366f26d48cdf26012ea744ae4a22784a5c3c12e12b0f188e997c93a6890ef0c3c336865ea93f13c45f70b258d
+    HEAD_REF master
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DDCMTK_WITH_DOXYGEN=OFF
+        -DDCMTK_WITH_ZLIB=OFF
+        -DDCMTK_WITH_OPENSSL=OFF
+        -DDCMTK_WITH_PNG=OFF
+        -DDCMTK_WITH_TIFF=OFF
+        -DDCMTK_WITH_XML=OFF
+        -DDCMTK_WITH_ICONV=OFF
+        -DDCMTK_FORCE_FPIC_ON_UNIX=ON
+        -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF
+        -DDCMTK_ENABLE_BUILTIN_DICTIONARY=ON
+        -DDCMTK_ENABLE_PRIVATE_TAGS=ON
+        -DBUILD_APPS=OFF
+        -DDCMTK_ENABLE_CXX11=ON
+        -DCMAKE_DEBUG_POSTFIX="d"
+    OPTIONS_DEBUG
+        -DINSTALL_HEADERS=OFF
+        -DINSTALL_OTHER=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/dcmtk RENAME copyright)
-- 
cgit v1.2.3