From 1c11bec722bbe25b1523cf436e9567d1689cc408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20T=C3=A4schner?= Date: Thu, 8 Jun 2017 08:00:22 +0200 Subject: Revert "[pango] Add CAIRO_WIN32_STATIC_BUILD symbol to static builds of pangocairo lib." This reverts commit 226eefef9da1ec3b601b192263ff3d6b95aaf3cf. --- ports/pango/CMakeLists.txt | 4 ---- ports/pango/CONTROL | 2 +- ports/pango/portfile.cmake | 2 -- 3 files changed, 1 insertion(+), 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) -- cgit v1.2.3