mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 03:10:09 +08:00
546813ae7b
* update glib to meson * update ci baseline * update glib to 2.66.3 remove cmakelists * fix some minor meson issue but meson is still a mess * add_bin_to_path to vcpkg_install_meson * regen docs * try fixing/touching all glib dependent ports * fix libsigcpp-3 version * fix glibmm * fix gmime * fix libcroco * update libnice * fix atk build * update harfbuzz * fix few builds * update libxmlpp * fix gdk-pixbuf * fix gts * gts add patch * remove old libsigcpp * add missing comma * fix supports logic * fix name mismatch * restore original ci baseline. * fix a lot of small details. increment controls. * fix harfbuzz & glib * bump port version * update port_versions * fix version field * update versions * fix glib in harfbuzz * update port versions * silly uppercase type * update port-versions * fix cairo build * update version * fix atk * update atk port-verisons * fix gts public includes * update versions * fix cairomm * fix pango * fix ignition * update versions. * fix gtk * fix librsvg * update versions * fix atk linux * fix libgpod * update versions * fix lcm * fix librsvg * update pango and pangomm * update pango to meson * more updates * update pixman * fix cairo * fix cairo * some fixes * reorder meson a bit * add none.txt for meson * fix x86_x64 to x86 "cross" builds * add tiff pkgconfig * update gdk-pixbuf * fix tiff and jpeg * add graphene * fix gdk-pixbuf * add sassc * update gtk * fix cairo complete build * add harfbuzz inlcude in pango since meson does not add it into pkgconfig. * fix gtk build. Remaining issue fix install script. * fix gtk build * fix io2d * add supports field * fix cartographer? * fix librsvg build * fix gtk build * fix cartographer * fix sassc on linux * fix tiff and libjpeg pc files * fix pixman x86 * _isnanf is undefined on arm- * merge fix for make on arm64 * fix gdk-pixbuf on arm64-windows * pixman remove test/demos. should fix it on osx. * [vcpkg_install_meson] add bin to path to run code generators * [vcpkg_configure_meson] deactivate native compiler in cross builds make x86 on x86_x64 a native instead of a cross build (as long as we are not building for UWP) * pixman reenable UWP support. * pixman reenable arm support * add pixman:arm-uwp=fail to baseline * update gtkmm * remove double whitespaces * gtk baseline gtk dependency on cairo x11 remove double spaces in flags * fix linux build * native none again * cairo fix cairo-script.pc * comment out patch since the cairo changes should have fixed it. * disable wayland backend in GTK since CI is missing system packages * silly typo in cairo pc file correction install lzo pc on windows * remove double spaces in _FLAGS remove unnecessary comments * actually disabling wayland backend * fix glib codegen issue having the wrong path * try to fix paths in glib codegen * integrate changes form #12860 * add the uwp patch back in * deactivate extra harfbuzz shapers. * vcpkg x-add-version --all --overwrite-version * remove patches in tesseract. * fix version * rerun add-version * add libgpod:x64-linux=fail to baseline due to missing system tools/libraries * change regex to take double - into account. * run x-add-version * run format-manifest * add missing removal of multiple spaces back into the regex * remove ws diff change * fix gtkmm the upstream way * remove ws to reduce diff * make glib build on osx * format manifest * run x-add-version * add pthread dependency * update baseline due to glib compiling on osx now. * add meson as a dep to glib * - add glib host dependencies - switch to manifest of touched ports * switch to manifest. * [libxml2] add gnuinstalldirs * [libxml2] add missing include of GNUInstallDirs * add version info * add include dir to pc files .... * update version * add UWP as crosscompiling target * Apply suggestions from code review * trying to fix cairo pthread detection on osx. * fix libmicrohttpd by adding the required system frameworks on osx * fix poppler by not removing the CXX standard * fix missing coretext header from harfbuzz in pano * fix formating issues * fix librsvg on osx * revert version changes * bump version * version stuff. * fix graphene version stuff * fix version stuff * removing ports from ci baseline to cause me pain * move cairomm:x64-linux=fail to gtkmm:x64-linx=fail remove pangomm:x64-osx=fail * fix typo * revert ws changes to vcpkg_install_meson * update port version after merge * version stuff * fix fluidsynth by adding vcpkg_check_features * move cairo to ci baseline on osx * version stuff * fluidsynth corrections * more version stuff * apply code review changes * clean version stuff. * update version stuff * code review cleanup * version stuff * formating * update version stuff again * remove gdi again * version stuff * version stuff * version baseline * Apply strega-nil suggestions from code review * run x-add-version * reset versions to upstream/master * v8 CONTROL -> json * reset fluidsynth to upstream/master * first batch of version-string -> version conversion * second and last batch of version-string -> version conversions * update version stuff * disable gdi feature in harfbuzz (missing user32 linkage in qt5-base) * version stuff * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * more CR stuff * update versions * back out provision changes so that pr can be merged. Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
63 lines
2.5 KiB
Diff
63 lines
2.5 KiB
Diff
diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
|
|
index 5ebeb6afa..702864667 100644
|
|
--- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
|
|
+++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
|
|
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.8)
|
|
|
|
project(io2d CXX)
|
|
|
|
-find_package(Cairo REQUIRED)
|
|
-find_package(GraphicsMagick REQUIRED)
|
|
+find_package(Cairo REQUIRED)
|
|
+find_package(unofficial-GraphicsMagick REQUIRED)
|
|
|
|
add_library(io2d_cairo
|
|
cairo_renderer-graphicsmagickinit.cpp
|
|
@@ -24,7 +24,7 @@ target_include_directories(io2d_cairo PUBLIC
|
|
|
|
target_compile_features(io2d_cairo PUBLIC cxx_std_17)
|
|
|
|
-target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo GraphicsMagick::GraphicsMagick)
|
|
+target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick)
|
|
|
|
install(
|
|
TARGETS io2d_cairo EXPORT io2d_targets
|
|
diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
|
|
index abb150113..75d8c654d 100644
|
|
--- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
|
|
+++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
|
|
@@ -27,15 +27,24 @@ if(MSVC)
|
|
target_compile_definitions(io2d_cairo_win32 PUBLIC -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS)
|
|
|
|
find_library(PIXMAN_LIB pixman-1)
|
|
- find_library(FREETYPE_LIB freetype)
|
|
- find_library(FONTCONFIG_LIB fontconfig)
|
|
- find_library(BZ_LIB bz2)
|
|
- find_library(JPEG_LIB jpeg)
|
|
- find_library(TIFF_LIB tiff)
|
|
- find_library(EXPAT_LIB expat)
|
|
- find_library(LZMA_LIB lzma)
|
|
- find_library(ICONV_LIB libiconv)
|
|
- find_library(CHARSET_LIB libcharset)
|
|
+ find_package(FreeType REQUIRED)
|
|
+ set(FREETYPE_LIB ${FREETYPE_LIBRARIES}) # I dont use targets here since this means I have to correct the config.cmake too
|
|
+ find_package(Fontconfig REQUIRED)
|
|
+ set(FONTCONFIG_LIB ${Fontconfig_LIBRARIES})
|
|
+ find_package(BZip2 REQUIRED)
|
|
+ set(BZ_LIB ${BZIP2_LIBRARIES})
|
|
+ find_package(JPEG REQUIRED)
|
|
+ set(JPEG_LIB ${JPEG_LIBRARIES})
|
|
+ find_package(TIFF REQUIRED)
|
|
+ set(TIFF_LIB ${TIFF_LIBRARIES})
|
|
+ find_package(EXPAT REQUIRED)
|
|
+ set(EXPAT_LIB ${EXPAT_LIBRARIES})
|
|
+ find_package(LibLZMA REQUIRED)
|
|
+ set(LZMA_LIB ${LIBLZMA_LIBRARIES})
|
|
+ find_package(Iconv REQUIRED)
|
|
+ if(NOT Iconv_IS_BUILT_IN)
|
|
+ set(ICONV_LIB ${Iconv_LIBRARIES})
|
|
+ endif()
|
|
|
|
target_link_libraries(io2d_cairo_win32 PUBLIC ${PIXMAN_LIB} ${FREETYPE_LIB} ${FONTCONFIG_LIB} ${BZ_LIB} ${JPEG_LIB} ${TIFF_LIB} ${EXPAT_LIB} ${LZMA_LIB} ${ICONV_LIB} ${CHARSET_LIB})
|
|
endif()
|