diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
| commit | c828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch) | |
| tree | b3fe00a043d5b9351868a0d1f8aead41bb52d2be /ports/gdcm | |
| parent | 6635a2fa596ca457565eebc2a45664309cd24d77 (diff) | |
| parent | f3f329a048eaff759c1992c458f2e12351486bc7 (diff) | |
| download | vcpkg-update-geos-381.tar.gz vcpkg-update-geos-381.zip | |
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
Diffstat (limited to 'ports/gdcm')
| -rw-r--r-- | ports/gdcm/CONTROL | 2 | ||||
| -rw-r--r-- | ports/gdcm/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/gdcm/use-expat-config.patch | 13 |
3 files changed, 1 insertions, 15 deletions
diff --git a/ports/gdcm/CONTROL b/ports/gdcm/CONTROL index e6d6b052d..aafb13a8d 100644 --- a/ports/gdcm/CONTROL +++ b/ports/gdcm/CONTROL @@ -1,6 +1,6 @@ Source: gdcm Version: 3.0.5 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/malaterre/GDCM Description: Grassroots DICOM library Build-Depends: zlib, expat, openjpeg diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake index e9afedd3c..3edb205d7 100644 --- a/ports/gdcm/portfile.cmake +++ b/ports/gdcm/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_from_github( use-openjpeg-config.patch fix-share-path.patch Fix-Cmake_DIR.patch - use-expat-config.patch ) file(REMOVE ${SOURCE_PATH}/CMake/FindOpenJPEG.cmake) diff --git a/ports/gdcm/use-expat-config.patch b/ports/gdcm/use-expat-config.patch deleted file mode 100644 index 94a54e6c7..000000000 --- a/ports/gdcm/use-expat-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 32786db..4215d25 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -426,7 +426,7 @@ endif()
-
- if(GDCM_USE_SYSTEM_EXPAT)
- # If user say so, then this is a requirement !
-- find_package(EXPAT REQUIRED)
-+ find_package(expat CONFIG REQUIRED)
- set(GDCM_EXPAT_LIBRARIES ${EXPAT_LIBRARIES})
- else()
- set(GDCM_EXPAT_LIBRARIES "gdcmexpat")
|