-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
0d2c77c
commit 3fc65fa
Showing
5 changed files
with
99 additions
and
59 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,29 @@ | ||
Source: wt | ||
Version: 4.2.2 | ||
Version: 4.4.0 | ||
Homepage: https://github.com/emweb/wt | ||
Description: Wt is a C++ library for developing web applications | ||
Build-Depends: openssl, sqlite3, libpq, pango, glew, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic, boost-interprocess | ||
Build-Depends: zlib, libpng, pango (!windows), harfbuzz (!windows), libharu, glew, boost-algorithm, boost-array, boost-asio, boost-bind, boost-config, boost-container-hash, boost-filesystem, boost-fusion, boost-interprocess, boost-lexical-cast, boost-logic, boost-math, boost-multi-index, boost-optional, boost-phoenix, boost-pool, boost-program-options, boost-range, boost-serialization, boost-smart-ptr, boost-spirit, boost-system, boost-thread, boost-tokenizer, boost-tuple, boost-ublas, boost-variant | ||
Default-Features: openssl | ||
|
||
Feature: dbo | ||
Description: Wt::Dbo | ||
|
||
Feature: postgresql | ||
Description: Wt::Dbo PostgreSQL backend | ||
Build-Depends: libpq, wt[dbo] | ||
|
||
Feature: sqlite3 | ||
Description: Wt::Dbo Sqlite 3 backend | ||
Build-Depends: sqlite3, wt[dbo] | ||
|
||
Feature: sqlserver | ||
Description: Wt::Dbo MS SQL Server backend | ||
Build-Depends: unixodbc (!windows), wt[dbo] | ||
|
||
Feature: openssl | ||
Description: TLS support | ||
Build-Depends: openssl | ||
|
||
Feature: graphicsmagick | ||
Description: WRasterImage support on non-Windows based on GraphicsMagick | ||
Build-Depends: graphicsmagick |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters