diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-05-10 14:03:59 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-09 23:03:59 -0700 |
| commit | ddec7174c17c927074c903a63f638808ad19ea07 (patch) | |
| tree | fa6497de0429d796354a39e259d4543a39862f15 /ports/gdcm2/find-openjpeg.patch | |
| parent | 0022e0b0ac96d1ebe514a757b670e09b0a148dc8 (diff) | |
| download | vcpkg-ddec7174c17c927074c903a63f638808ad19ea07.tar.gz vcpkg-ddec7174c17c927074c903a63f638808ad19ea07.zip | |
[gdcm]Update to v3.0.0 and rename to gdcm. (#6348)
* [gdcm]Update to v3.0.0 and rename to gdcm.
* [gdcm2]Add empty port "gdcm2" mapping to port gdcm
Diffstat (limited to 'ports/gdcm2/find-openjpeg.patch')
| -rw-r--r-- | ports/gdcm2/find-openjpeg.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/ports/gdcm2/find-openjpeg.patch b/ports/gdcm2/find-openjpeg.patch deleted file mode 100644 index c3fff18f5..000000000 --- a/ports/gdcm2/find-openjpeg.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/CMake/FindOpenJPEG.cmake -+++ b/CMake/FindOpenJPEG.cmake -@@ -20,14 +20,38 @@ - - # Try with pkg-config first - find_package(PkgConfig) --pkg_check_modules(OPENJPEG libopenjp2) -+if (PKG_CONFIG_FOUND) -+ pkg_check_modules(OPENJPEG libopenjp2) -+ include(FindPackageHandleStandardArgs) -+ find_package_handle_standard_args(OpenJPEG REQUIRED_VARS -+ OPENJPEG_LIBRARIES -+ OPENJPEG_INCLUDE_DIRS -+ VERSION_VAR OPENJPEG_VERSION -+ ) -+endif() - --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(OpenJPEG REQUIRED_VARS -- OPENJPEG_LIBRARIES -- OPENJPEG_INCLUDE_DIRS -- VERSION_VAR OPENJPEG_VERSION --) -+find_path(OPENJPEG_INCLUDE_DIR NAMES openjpeg.h) -+find_library(OPENJPEG_LIBRARY NAMES openjp2) -+if (OPENJPEG_LIBRARY) -+ string(FIND ${OPENJPEG_LIBRARY} debug _debug_substrpos) -+ if (_debug_substrpos EQUAL -1) -+ set(OPENJPEG_LIBRARY_RELEASE ${OPENJPEG_LIBRARY}) -+ string(REPLACE "/lib" "/debug/lib" OPENJPEG_LIBRARY_DEBUG ${OPENJPEG_LIBRARY_RELEASE}) -+ else() -+ set(OPENJPEG_LIBRARY_DEBUG ${OPENJPEG_LIBRARY}) -+ string(REPLACE "/debug/lib" "/lib" OPENJPEG_LIBRARY_RELEASE ${OPENJPEG_LIBRARY_DEBUG}) -+ endif() -+ set(OPENJPEG_LIBRARY optimized ${OPENJPEG_LIBRARY_RELEASE} debug ${OPENJPEG_LIBRARY_DEBUG}) -+ set(OPENJPEG_FOUND TRUE) -+endif() -+ -+if (OPENJPEG_FOUND) -+ set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY}) -+ set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR}) -+ message(STATUS "Found OPENJPEG library ${OPENJPEG_LIBRARIES}") -+else() -+ message(FATAL_ERROR "NOT found OPENJPEG") -+endif() - - mark_as_advanced( - OPENJPEG_LIBRARIES |