Revert "[pango] Add CAIRO_WIN32_STATIC_BUILD symbol to static builds …

…of pangocairo lib." This reverts commit 226eefe.
microsoft · Jun 8, 2017 · 1c11bec · 1c11bec
1 parent 226eefe
commit 1c11bec
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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
@@ -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)