diff options
| author | Alexander Täschner <A.Taeschner@gsi.de> | 2017-06-08 08:00:22 +0200 |
|---|---|---|
| committer | Alexander Täschner <A.Taeschner@gsi.de> | 2017-06-08 08:00:22 +0200 |
| commit | 1c11bec722bbe25b1523cf436e9567d1689cc408 (patch) | |
| tree | 1d666b3b6ab1975ec56cd507dd41b2a9fb8a5470 | |
| parent | 226eefef9da1ec3b601b192263ff3d6b95aaf3cf (diff) | |
| download | vcpkg-1c11bec722bbe25b1523cf436e9567d1689cc408.tar.gz vcpkg-1c11bec722bbe25b1523cf436e9567d1689cc408.zip | |
Revert "[pango] Add CAIRO_WIN32_STATIC_BUILD symbol to static builds of pangocairo lib."
This reverts commit 226eefef9da1ec3b601b192263ff3d6b95aaf3cf.
| -rw-r--r-- | ports/pango/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/pango/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pango/portfile.cmake | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index ea36939b5..7dad7dbcf 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -130,10 +130,6 @@ pango_add_module(pangocairo pango/pangocairo-font.c pango/pangocairo-fontmap.c pango/pangocairo-render.c) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - target_compile_definitions(pangocairo PRIVATE CAIRO_WIN32_STATIC_BUILD=1) -endif() target_link_libraries(pangocairo ${CAIRO_LIBRARIES} pango pangowin32 pangoft2 ${FONT_LIBRARIES}) target_include_directories(pangocairo PRIVATE ${CAIRO_INCLUDE_DIR} ${FONT_INCLUDE_DIRS}) diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index f5e2709c4..011f33691 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,4 +1,4 @@ Source: pango
-Version: 1.40.6-1
+Version: 1.40.6
Description: Text and font handling library.
Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz
diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 4e373e84a..7f28b8ca7 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -17,8 +17,6 @@ vcpkg_apply_patches( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS
- -DVCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE}
OPTIONS_DEBUG
-DPANGO_SKIP_HEADERS=ON)
|