diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-08-28 07:20:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-27 22:20:06 -0700 |
| commit | 53a47bca4f5574bc3c7630d8e07b1fc8f580165f (patch) | |
| tree | 37d50100c3e2ba52ec553f18cea45fd8db4f55c3 /ports/gdcm | |
| parent | 2f52c7cbaa13650c525c843af4699fda19c819f7 (diff) | |
| download | vcpkg-53a47bca4f5574bc3c7630d8e07b1fc8f580165f.tar.gz vcpkg-53a47bca4f5574bc3c7630d8e07b1fc8f580165f.zip | |
[expat] Fix a few details with expat. (#13022)
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
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")
|