[gdcm] properly fix microsoft#6863 instead of wrong microsoft#6901

cenit · Jul 29, 2019 · 8582cb7 · 8582cb7
1 parent 429eb43
commit 8582cb7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ports/gdcm/CONTROL b/ports/gdcm/CONTROL
@@ -1,4 +1,4 @@
 Source: gdcm
-Version: 3.0.0-3
+Version: 3.0.0-4
 Description: Grassroots DICOM library
 Build-Depends: zlib, expat, openjpeg
diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake
@@ -43,6 +43,12 @@ file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/share
 )
 
+file(READ ${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMTargets.cmake GDCM_TARGETS)
+string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)"
+               "set(CMAKE_IMPORT_FILE_VERSION 1)
+find_package(OpenJPEG QUIET)" GDCM_TARGETS "${GDCM_TARGETS}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMTargets.cmake "${GDCM_TARGETS}")
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()

diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
@@ -351,8 +351,7 @@ find_package(gflags QUIET)
 find_package(Ceres QUIET)
 find_package(ade QUIET)
 find_package(VTK QUIET)
-find_package(GDCM QUIET)
-find_package(OpenJPEG QUIET)" OPENCV_MODULES "${OPENCV_MODULES}")
+find_package(GDCM QUIET)" OPENCV_MODULES "${OPENCV_MODULES}")
   file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}")
 
   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)