diff options
| author | Roel Standaert <roel@abittechnical.com> | 2020-08-21 19:39:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 10:39:52 -0700 |
| commit | 3fc65fa6cfd722220da4ca3f4629cfc8e59df58c (patch) | |
| tree | 8046637cf1485e4d423fc48e362ac144b57bd48b /ports/wt/0006-GraphicsMagick.patch | |
| parent | 0d2c77cdb761a405cbe57017c278547fafd1b5b7 (diff) | |
| download | vcpkg-3fc65fa6cfd722220da4ca3f4629cfc8e59df58c.tar.gz vcpkg-3fc65fa6cfd722220da4ca3f4629cfc8e59df58c.zip | |
[wt] Update to 4.4.0 (#13005)
Diffstat (limited to 'ports/wt/0006-GraphicsMagick.patch')
| -rw-r--r-- | ports/wt/0006-GraphicsMagick.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/ports/wt/0006-GraphicsMagick.patch b/ports/wt/0006-GraphicsMagick.patch new file mode 100644 index 000000000..2f1b50a60 --- /dev/null +++ b/ports/wt/0006-GraphicsMagick.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5012cfd1b..95f812685 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -338,7 +338,7 @@ ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) + ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) + + IF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "GraphicsMagick") +- IF (NOT GM_FOUND) ++ IF (0) + MESSAGE(FATAL_ERROR "WT_WRASTERIMAGE_IMPLEMENTATION set to GraphicsMagick but GM is not found. Indicate the location of your graphicsmagick library using -DGM_PREFIX=...") + ENDIF (NOT GM_FOUND) + SET(WT_HAS_WRASTERIMAGE true) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 78d82ee53..01ac5f42a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -595,8 +595,9 @@ ELSE(HAVE_HARU) + ENDIF(HAVE_HARU) + + IF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "GraphicsMagick") +- TARGET_LINK_LIBRARIES(wt PRIVATE ${GM_LIBRARIES}) +- INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS}) ++ find_package(unofficial-graphicsmagick REQUIRED) ++ TARGET_LINK_LIBRARIES(wt PRIVATE unofficial::graphicsmagick::graphicsmagick) ++ # INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS}) + ADD_DEFINITIONS(-DHAVE_GRAPHICSMAGICK) + ELSEIF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "skia") + TARGET_LINK_LIBRARIES(wt PRIVATE ${SKIA_LIBRARIES}) |