mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 08:39:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[expat] Fix expat msvc link static crt (#27948)

Browse Source 
* Fix expat msvc link static crt

* update port version
This commit is contained in:
xiaozhuai, Weihang Ding 2022-11-24 02:12:44 +08:00 committed by GitHub
parent 2705bcd229
commit cb76ac9e92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/expat/portfile.cmake
View File

@ -7,6 +7,7 @@ vcpkg_from_github(
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" EXPAT_CRT_LINKAGE)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/expat"
@ -16,6 +17,7 @@ vcpkg_cmake_configure(
-DEXPAT_BUILD_TOOLS=OFF
-DEXPAT_BUILD_DOCS=OFF
-DEXPAT_SHARED_LIBS=${EXPAT_LINKAGE}
-DEXPAT_MSVC_STATIC_CRT=${EXPAT_CRT_LINKAGE}
-DEXPAT_BUILD_PKGCONFIG=ON
)

1
ports/expat/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "expat",
"version": "2.5.0",
"port-version": 1,
"description": "XML parser library written in C",
"homepage": "https://github.com/libexpat/libexpat",
"license": "MIT",

4
ports/python3/portfile.cmake
View File

@ -83,8 +83,8 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
find_library(BZ2_DEBUG NAMES bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(CRYPTO_RELEASE NAMES libcrypto PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(CRYPTO_DEBUG NAMES libcrypto PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(EXPAT_RELEASE NAMES libexpat libexpatMD PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(EXPAT_DEBUG NAMES libexpatd libexpatdMD PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(EXPAT_RELEASE NAMES libexpat libexpatMD libexpatMT PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(EXPAT_DEBUG NAMES libexpatd libexpatdMD libexpatdMT PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(FFI_RELEASE NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(FFI_DEBUG NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(LZMA_RELEASE NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)

1
ports/python3/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "python3",
"version": "3.10.7",
"port-version": 1,
"description": "The Python programming language",
"homepage": "https://github.com/python/cpython",
"license": "Python-2.0",

2
ports/skia/portfile.cmake
View File

@ -123,7 +123,7 @@ endfunction()
set(_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include")
replace_skia_dep(expat "/include" "libexpat,libexpatd,libexpatdMD" "libexpat,libexpatMD" "")
replace_skia_dep(expat "/include" "libexpat,libexpatd,libexpatdMD,libexpatdMT" "libexpat,libexpatMD,libexpatMT" "")
replace_skia_dep(freetype2 "/include" "freetype,freetyped" "freetype" "")
replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz;harfbuzz-subset" "harfbuzz;harfbuzz-subset" "")
replace_skia_dep(icu "/include" "icuuc,icuucd" "icuuc" "U_USING_ICU_NAMESPACE=0")

2
ports/skia/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "skia",
"version": "0.36.0",
"port-version": 1,
"port-version": 2,
"description": [
"Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.",
"It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.",

6
versions/baseline.json
View File

@ -2198,7 +2198,7 @@
},
"expat": {
"baseline": "2.5.0",
"port-version": 0
"port-version": 1
},
"expected-lite": {
"baseline": "0.6.2",
@ -6018,7 +6018,7 @@
},
"python3": {
"baseline": "3.10.7",
"port-version": 0
"port-version": 1
},
"qca": {
"baseline": "2.3.4",
@ -6966,7 +6966,7 @@
},
"skia": {
"baseline": "0.36.0",
"port-version": 1
"port-version": 2
},
"skyr-url": {
"baseline": "1.13.0",

5
versions/e-/expat.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5da852ba8ea975e8f950bf766129724327232861",
"version": "2.5.0",
"port-version": 1
},
{
"git-tree": "59123c85dfc30e456d0bc5894befd6d461d35d7c",
"version": "2.5.0",

5
versions/p-/python3.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cd1c4998e317f9fcfed85a04c1e276dff9ddde84",
"version": "3.10.7",
"port-version": 1
},
{
"git-tree": "047f7eca7d1000287f2389302d5c292251d023f2",
"version": "3.10.7",

5
versions/s-/skia.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9fbb8b718ca60d7e42b587f4d3e565e563386268",
"version": "0.36.0",
"port-version": 2
},
{
"git-tree": "e8c048560560ea0b90b45c5e9101b1d813401134",
"version": "0.36.0",