early-access version 2853
This commit is contained in:
41
externals/vcpkg/ports/cairomm/build-support-msvc2022.diff
vendored
Executable file
41
externals/vcpkg/ports/cairomm/build-support-msvc2022.diff
vendored
Executable file
@@ -0,0 +1,41 @@
|
||||
commit ed1ce9a630b375b0f43435e34fbe690eb8276178
|
||||
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
|
||||
Date: Wed Nov 10 16:11:04 2021 +0800
|
||||
|
||||
build: Support Visual Studio 2022
|
||||
|
||||
Make these builds distinct from the Visual Studio 2019 builds.
|
||||
|
||||
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
|
||||
index bf2e906..58b7092 100644
|
||||
--- a/MSVC_NMake/detectenv-msvc.mak
|
||||
+++ b/MSVC_NMake/detectenv-msvc.mak
|
||||
@@ -98,9 +98,12 @@ PDBVER = 14
|
||||
!if $(VCVERSION) > 1909 && $(VCVERSION) < 1920
|
||||
VSVER_SUFFIX = 1
|
||||
VSVER = 15
|
||||
-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
|
||||
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930
|
||||
VSVER_SUFFIX = 2
|
||||
VSVER = 16
|
||||
+!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000
|
||||
+VSVER_SUFFIX = 3
|
||||
+VSVER = 17
|
||||
!else
|
||||
VSVER = $(PDBVER)
|
||||
!endif
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 8b18fc2..1fa2da0 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -238,7 +238,9 @@ if is_msvc
|
||||
add_project_arguments(disabled_warning, language: 'cpp')
|
||||
endforeach
|
||||
if use_msvc14x_toolset_ver
|
||||
- if cpp_compiler.version().version_compare('>=19.20')
|
||||
+ if cpp_compiler.version().version_compare('>=19.30')
|
||||
+ msvc14x_toolset_ver = '-vc143'
|
||||
+ elif cpp_compiler.version().version_compare('>=19.20')
|
||||
msvc14x_toolset_ver = '-vc142'
|
||||
elif cpp_compiler.version().version_compare('>=19.10')
|
||||
msvc14x_toolset_ver = '-vc141'
|
||||
41
externals/vcpkg/ports/cairomm/portfile.cmake
vendored
Executable file
41
externals/vcpkg/ports/cairomm/portfile.cmake
vendored
Executable file
@@ -0,0 +1,41 @@
|
||||
set(CAIROMM_VERSION 1.16.1)
|
||||
set(CAIROMM_HASH 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://www.cairographics.org/releases/cairomm-${CAIROMM_VERSION}.tar.xz"
|
||||
FILENAME "cairomm-${CAIROMM_VERSION}.tar.xz"
|
||||
SHA512 ${CAIROMM_HASH}
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
build-support-msvc2022.diff
|
||||
)
|
||||
|
||||
vcpkg_configure_meson(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
OPTIONS
|
||||
-Dbuild-examples=false
|
||||
-Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019
|
||||
)
|
||||
|
||||
vcpkg_install_meson()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
||||
if(VCPKG_LIBRARY_LINAKGE STREQUAL "static")
|
||||
set(_file "${CURRENT_PACKAGES_DIR}/lib/cairomm-1.16/include/cairommconfig.h")
|
||||
if(EXISTS "${_file}")
|
||||
vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
|
||||
endif()
|
||||
set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/cairomm-1.16/include/cairommconfig.h")
|
||||
if(EXISTS "${_file}")
|
||||
vcpkg_replace_string("${_file}" "# define CAIROMM_DLL 1" "# undef CAIROMM_DLL\n# define CAIROMM_STATIC_LIB 1")
|
||||
endif()
|
||||
endif()
|
||||
15
externals/vcpkg/ports/cairomm/vcpkg.json
vendored
Executable file
15
externals/vcpkg/ports/cairomm/vcpkg.json
vendored
Executable file
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"name": "cairomm",
|
||||
"version": "1.16.1",
|
||||
"description": "A C++ wrapper for the cairo graphics library",
|
||||
"homepage": "https://www.cairographics.org",
|
||||
"license": "LGPL-2.0-only",
|
||||
"dependencies": [
|
||||
"cairo",
|
||||
"libsigcpp",
|
||||
{
|
||||
"name": "vcpkg-tool-meson",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user