aboutsummaryrefslogtreecommitdiff
path: root/ports/cairomm/cmake
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2021-04-26 19:28:21 +0200
committerGitHub <noreply@github.com>2021-04-26 10:28:21 -0700
commit546813ae7b9e2873dd3d38e78b27ac5582feae10 (patch)
tree6acb3bf022bf9060c70c0665d3586bb33a60f4d9 /ports/cairomm/cmake
parenta9b27ed5dffbf70b135eddb0c4729f3ca87f106c (diff)
downloadvcpkg-546813ae7b9e2873dd3d38e78b27ac5582feae10.tar.gz
vcpkg-546813ae7b9e2873dd3d38e78b27ac5582feae10.zip
[glib up to gtk] update and make it work with meson (#13100)
* 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>
Diffstat (limited to 'ports/cairomm/cmake')
-rw-r--r--ports/cairomm/cmake/FindCairo.cmake131
-rw-r--r--ports/cairomm/cmake/FindSigC++.cmake111
-rw-r--r--ports/cairomm/cmake/cairomm.rc.cmake71
-rw-r--r--ports/cairomm/cmake/cairommconfig.h.cmake13
4 files changed, 0 insertions, 326 deletions
diff --git a/ports/cairomm/cmake/FindCairo.cmake b/ports/cairomm/cmake/FindCairo.cmake
deleted file mode 100644
index 0a87fadf8..000000000
--- a/ports/cairomm/cmake/FindCairo.cmake
+++ /dev/null
@@ -1,131 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-#
-# revision: 2
-# See https://github.com/CMakePorts/CMakeFindPackages for updates
-#
-#.rst:
-# FindCairo
-# ---------
-#
-# Locate Cairo library
-#
-# This module defines
-#
-# ::
-# CAIRO_FOUND - system has the CAIRO library
-# CAIRO_INCLUDE_DIR - the CAIRO include directory
-# CAIRO_LIBRARIES - The libraries needed to use CAIRO
-# CAIRO_VERSION - This is set to $major.$minor.$revision (eg. 0.9.8)
-# CAIRO_VERSION_STRING - This is set to $major.$minor.$revision (eg. 0.9.8)
-#
-# Authors:
-# Copyright (c) Eric Wing
-# Copyright (c) Alexander Neundorf
-# Copyright (c) 2008 Joshua L. Blocher <verbalshadow at gmail dot com>
-# Copyright (c) 2012 Dmitry Baryshnikov <polimax at mail dot ru>
-# Copyright (c) 2013-2017 Mikhail Paulyshka <me at mixaill dot tk>
-#
-
-
-if (NOT WIN32)
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
- pkg_check_modules(_CAIRO cairo)
-
- SET(CAIRO_VERSION ${_CAIRO_VERSION})
- STRING (REGEX REPLACE "([0-9]+).([0-9]+).([0-9]+)" "\\1" num "${CAIRO_VERSION}")
- MATH (EXPR CAIRO_VERSION_MAJOR "${num}")
- STRING (REGEX REPLACE "([0-9]+).([0-9]+).([0-9]+)" "\\2" num "${CAIRO_VERSION}")
- MATH (EXPR CAIRO_VERSION_MINOR "${num}")
- STRING (REGEX REPLACE "([0-9]+).([0-9]+).([0-9]+)" "\\3" num "${CAIRO_VERSION}")
- MATH (EXPR CAIRO_VERSION_MICRO "${num}")
- endif (PKG_CONFIG_FOUND)
-endif (NOT WIN32)
-
-set(_CAIRO_ROOT_HINTS_AND_PATHS
- HINTS
- $ENV{CAIRO}
- $ENV{CAIRO_DIR}
- ${CMAKE_FIND_ROOT_PATH}
- ${CAIRO_ROOT_DIR}
- PATHS
- ${CMAKE_FIND_ROOT_PATH}
- $ENV{CAIRO}/src
- /usr
- /usr/local
-)
-
-find_path(CAIRO_INCLUDE_DIR
- NAMES
- cairo.h
- HINTS
- ${_CAIRO_INCLUDEDIR}
- ${_CAIRO_ROOT_HINTS_AND_PATHS}
- PATH_SUFFIXES
- include
- "include/cairo"
-)
-
-if(NOT CAIRO_LIBRARY)
- FIND_LIBRARY(CAIRO_LIBRARY_RELEASE
- NAMES
- cairo
- cairo-static
- HINTS
- ${_CAIRO_LIBDIR}
- ${_CAIRO_ROOT_HINTS_AND_PATHS}
- PATH_SUFFIXES
- "lib"
- "local/lib"
- )
-
- FIND_LIBRARY(CAIRO_LIBRARY_DEBUG
- NAMES
- cairod
- cairo-staticd
- HINTS
- ${_CAIRO_LIBDIR}
- ${_CAIRO_ROOT_HINTS_AND_PATHS}
- PATH_SUFFIXES
- "lib"
- "local/lib"
- )
-
- include(SelectLibraryConfigurations)
- select_library_configurations(CAIRO)
-endif()
-set(CAIRO_LIBRARIES ${CAIRO_LIBRARY})
-
-if (NOT CAIRO_VERSION)
- if (EXISTS "${CAIRO_INCLUDE_DIR}/cairo-version.h")
- file(READ "${CAIRO_INCLUDE_DIR}/cairo-version.h" CAIRO_VERSION_CONTENT)
-
- string(REGEX MATCH "#define +CAIRO_VERSION_MAJOR +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
- set(CAIRO_VERSION_MAJOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define +CAIRO_VERSION_MINOR +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
- set(CAIRO_VERSION_MINOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define +CAIRO_VERSION_MICRO +([0-9]+)" _dummy "${CAIRO_VERSION_CONTENT}")
- set(CAIRO_VERSION_MICRO "${CMAKE_MATCH_1}")
-
- set(CAIRO_VERSION "${CAIRO_VERSION_MAJOR}.${CAIRO_VERSION_MINOR}.${CAIRO_VERSION_MICRO}")
- set(CAIRO_VERSION_STRING CAIRO_VERSION)
- endif ()
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
- CAIRO
- REQUIRED_VARS
- CAIRO_LIBRARIES
- CAIRO_INCLUDE_DIR
- VERSION_VAR
- CAIRO_VERSION_STRING
-)
-
-MARK_AS_ADVANCED(
- CAIRO_INCLUDE_DIR
- CAIRO_LIBRARY
- CAIRO_LIBRARIES)
diff --git a/ports/cairomm/cmake/FindSigC++.cmake b/ports/cairomm/cmake/FindSigC++.cmake
deleted file mode 100644
index 8d65f70d9..000000000
--- a/ports/cairomm/cmake/FindSigC++.cmake
+++ /dev/null
@@ -1,111 +0,0 @@
-# - Try to find SIGC++
-# Once done this will define
-#
-# SIGC++_ROOT_DIR - Set this variable to the root installation of SIGC++
-# SIGC++_FOUND - system has SIGC++
-# SIGC++_INCLUDE_DIRS - the SIGC++ include directory
-# SIGC++_LIBRARIES - Link these to use SIGC++
-#
-# Copyright (c) 2008 Joshua L. Blocher <verbalshadow at gmail dot com>
-# Copyright (c) 2012 Dmitry Baryshnikov <polimax at mail dot ru>
-# Copyright (c) 2013-2017 Mikhail Paulyshka <me at mixaill dot tk>
-#
-# Distributed under the OSI-approved BSD License
-#
-
-if (NOT WIN32)
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
- pkg_check_modules(_SIGC++ sigc++-2.0)
- SET(SIGC++_VERSION ${_SIGC++_VERSION})
- endif (PKG_CONFIG_FOUND)
-endif (NOT WIN32)
-
-SET(_SIGC++_ROOT_HINTS
- $ENV{SIGC++}
- ${CMAKE_FIND_ROOT_PATH}
- ${SIGC++_ROOT_DIR}
-)
-
-SET(_SIGC++_ROOT_PATHS
- $ENV{SIGC++}/src
- /usr
- /usr/local
-)
-
-SET(_SIGC++_ROOT_HINTS_AND_PATHS
- HINTS ${_SIGC++_ROOT_HINTS}
- PATHS ${_SIGC++_ROOT_PATHS}
-)
-
-FIND_PATH(SIGC++_INCLUDE_DIR
- NAMES
- "sigc++/sigc++.h"
- HINTS
- ${_SIGC++_INCLUDEDIR}
- ${_SIGC++_ROOT_HINTS_AND_PATHS}
- PATH_SUFFIXES
- include
- "include/sigc++-2.0"
-)
-
-find_path(SIGC++_CONFIG_INCLUDE_DIR
- NAMES
- sigc++config.h
- HINTS
- ${_SIGC++_LIBDIR}
- ${_SIGC++_INCLUDEDIR}
- ${_SIGC++_ROOT_HINTS_AND_PATHS}
- PATH_SUFFIXES
- include
- lib
- "sigc++-2.0/include"
- "lib/sigc++-2.0"
- "lib/sigc++-2.0/include"
-)
-
-FIND_LIBRARY(SIGC++_LIBRARY
- NAMES
- sigc-2.0
- HINTS
- ${_SIGC++_LIBDIR}
- ${_SIGC++_ROOT_HINTS_AND_PATHS}
- PATH_SUFFIXES
- "lib"
- "local/lib"
-)
-
-SET(SIGC++_LIBRARIES
- ${SIGC++_LIBRARY}
-)
-
-SET(SIGC++_INCLUDE_DIRS
- ${SIGC++_INCLUDE_DIR}
- ${SIGC++_CONFIG_INCLUDE_DIR}
-)
-
-if (NOT SIGC++_VERSION)
- if (EXISTS "${SIGC++_CONFIG_INCLUDE_DIR}/sigc++config.h")
- file(READ "${SIGC++_CONFIG_INCLUDE_DIR}/sigc++config.h" SIGC++_VERSION_CONTENT)
-
- string(REGEX MATCH "#define +SIGCXX_MAJOR_VERSION +([0-9]+)" _dummy "${SIGC++_VERSION_CONTENT}")
- set(SIGC++_VERSION_MAJOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define +SIGCXX_MINOR_VERSION +([0-9]+)" _dummy "${SIGC++_VERSION_CONTENT}")
- set(SIGC++_VERSION_MINOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define +SIGCXX_MICRO_VERSION +([0-9]+)" _dummy "${SIGC++_VERSION_CONTENT}")
- set(SIGC++_VERSION_MICRO "${CMAKE_MATCH_1}")
-
- set(SIGC++_VERSION "${SIGC++_VERSION_MAJOR}.${SIGC++_VERSION_MINOR}.${SIGC++_VERSION_MICRO}")
- endif (EXISTS "${SIGC++_CONFIG_INCLUDE_DIR}/sigc++config.h")
-endif(NOT SIGC++_VERSION)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SIGC++
- REQUIRED_VARS SIGC++_LIBRARIES SIGC++_INCLUDE_DIRS
- VERSION_VAR SIGC++_VERSION
- FAIL_MESSAGE "Could NOT find SIGC++, try to set the path to SIGC++ root folder in the system variable SIGC++"
-)
-
-MARK_AS_ADVANCED(SIGC++_CONFIG_INCLUDE_DIR SIGC++_INCLUDE_DIR SIGC++_INCLUDE_DIRS SIGC++_LIBRARY SIGC++_LIBRARIES)
diff --git a/ports/cairomm/cmake/cairomm.rc.cmake b/ports/cairomm/cmake/cairomm.rc.cmake
deleted file mode 100644
index 4aa7a0a05..000000000
--- a/ports/cairomm/cmake/cairomm.rc.cmake
+++ /dev/null
@@ -1,71 +0,0 @@
-
-#define APSTUDIO_READONLY_SYMBOLS
-
-#include <windows.h>
-
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION @CAIROMM_MAJOR_VERSION@,@CAIROMM_MINOR_VERSION@,@CAIROMM_MICRO_VERSION@,1
- PRODUCTVERSION @CAIROMM_MAJOR_VERSION@,@CAIROMM_MINOR_VERSION@,@CAIROMM_MICRO_VERSION@,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "The cairomm development team (see AUTHORS)"
- VALUE "FileDescription", "The official C++ wrapper for cairo"
- VALUE "FileVersion", "@VERSION@"
- VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
- VALUE "OriginalFilename", "cairomm-1.0"
- VALUE "ProductName", "cairomm"
- VALUE "ProductVersion", "@VERSION@"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif // English (U.S.) resources
-
-#ifndef APSTUDIO_INVOKED
-
-#endif // not APSTUDIO_INVOKED
diff --git a/ports/cairomm/cmake/cairommconfig.h.cmake b/ports/cairomm/cmake/cairommconfig.h.cmake
deleted file mode 100644
index 526a70c4c..000000000
--- a/ports/cairomm/cmake/cairommconfig.h.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-/* This file is part of cairomm. */
-
-/* Defined when the --enable-api-exceptions configure argument was given */
-#cmakedefine CAIROMM_EXCEPTIONS_ENABLED 1
-
-/* Major version number of cairomm. */
-#cmakedefine CAIROMM_MAJOR_VERSION @CAIROMM_MAJOR_VERSION@
-
-/* Minor version number of cairomm. */
-#cmakedefine CAIROMM_MINOR_VERSION @CAIROMM_MINOR_VERSION@
-
-/* Micro version number of cairomm. */
-#cmakedefine CAIROMM_MICRO_VERSION @CAIROMM_MICRO_VERSION@