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

[vcpkg-tool-meson,glib] Update meson, fix languages (#41135)

Browse Source
This commit is contained in:
Kai Pastor 2024-09-25 21:16:27 +02:00 committed by GitHub
parent 3289c7a998
commit 419d6258d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/glib/portfile.cmake
View File

@ -12,8 +12,9 @@ vcpkg_extract_source_archive(SOURCE_PATH
libintl.patch libintl.patch
) )
set(LANGUAGES C CXX)
if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_ENABLE_OBJC=1") list(APPEND LANGUAGES OBJC OBJCXX)
endif() endif()
vcpkg_list(SET OPTIONS) vcpkg_list(SET OPTIONS)
@ -41,7 +42,7 @@ endif()
vcpkg_configure_meson( vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
LANGUAGES C CXX OBJC OBJCXX LANGUAGES ${LANGUAGES}
ADDITIONAL_BINARIES ADDITIONAL_BINARIES
${ADDITIONAL_BINARIES} ${ADDITIONAL_BINARIES}
OPTIONS OPTIONS

12
ports/glib/vcpkg.json
View File

@ -1,14 +1,22 @@
{ {
"name": "glib", "name": "glib",
"version": "2.78.4", "version": "2.78.4",
"port-version": 3, "port-version": 4,
"description": "Portable, general-purpose utility library.", "description": "Portable, general-purpose utility library.",
"homepage": "https://developer.gnome.org/glib/", "homepage": "https://developer.gnome.org/glib/",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
"supports": "!uwp & !xbox", "supports": "!uwp & !xbox",
"dependencies": [ "dependencies": [
"dirent", "dirent",
"gettext", {
"name": "gettext",
"host": true,
"default-features": false,
"features": [
"tools"
]
},
"gettext-libintl",
"libffi", "libffi",
"libiconv", "libiconv",
"pcre2", "pcre2",

2
ports/vcpkg-tool-meson/vcpkg-port-config.cmake
View File

@ -14,7 +14,7 @@ set(ref "${program_version}")
set(path_to_search "${DOWNLOADS}/tools/meson-${program_version}-${meson_short_hash}") set(path_to_search "${DOWNLOADS}/tools/meson-${program_version}-${meson_short_hash}")
set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz")
set(download_filename "meson-${ref}.tar.gz") set(download_filename "meson-${ref}.tar.gz")
set(download_sha512 328859712ebe33c042d66e762a1ffbc6f4a3f44d1b2d76e6c09b5a73a967873d24646bf0d6af27bd36427c7e6a37a0ec6595754fcbeef85724e176c6c1e52a8d) set(download_sha512 54c6611dd95caaffa216f03d0b96b44c86d5452f54e1282234a4646f8e50f75ea0185a1611a4c078c888154bd4e2d917c4d075de3e7577440a925f72f6152a4f)
find_program(SCRIPT_MESON NAMES ${search_names} PATHS "${path_to_search}" NO_DEFAULT_PATH) # NO_DEFAULT_PATH due top patching find_program(SCRIPT_MESON NAMES ${search_names} PATHS "${path_to_search}" NO_DEFAULT_PATH) # NO_DEFAULT_PATH due top patching

2
ports/vcpkg-tool-meson/vcpkg.json
View File

@ -1,6 +1,6 @@
{ {
"name": "vcpkg-tool-meson", "name": "vcpkg-tool-meson",
"version": "1.5.1", "version": "1.5.2",
"description": "Meson build system", "description": "Meson build system",
"homepage": "https://github.com/mesonbuild/meson", "homepage": "https://github.com/mesonbuild/meson",
"license": "Apache-2.0", "license": "Apache-2.0",

1
ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake
View File

@ -320,6 +320,7 @@ function(vcpkg_generate_meson_cmd_args)
if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
z_vcpkg_select_default_vcpkg_chainload_toolchain() z_vcpkg_select_default_vcpkg_chainload_toolchain()
endif() endif()
vcpkg_list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_LANGUAGES=${arg_LANGUAGES}")
vcpkg_cmake_get_vars(cmake_vars_file) vcpkg_cmake_get_vars(cmake_vars_file)
debug_message("Including cmake vars from: ${cmake_vars_file}") debug_message("Including cmake vars from: ${cmake_vars_file}")
include("${cmake_vars_file}") include("${cmake_vars_file}")

4
versions/baseline.json
View File

@ -3130,7 +3130,7 @@
}, },
"glib": { "glib": {
"baseline": "2.78.4", "baseline": "2.78.4",
"port-version": 3 "port-version": 4
}, },
"glib-networking": { "glib-networking": {
"baseline": "2.78.0", "baseline": "2.78.0",
@ -9325,7 +9325,7 @@
"port-version": 1 "port-version": 1
}, },
"vcpkg-tool-meson": { "vcpkg-tool-meson": {
"baseline": "1.5.1", "baseline": "1.5.2",
"port-version": 0 "port-version": 0
}, },
"vcpkg-tool-mozbuild": { "vcpkg-tool-mozbuild": {

5
versions/g-/glib.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "ee1411dc98162edf7c0e77780050dc8ddc7b3aae",
"version": "2.78.4",
"port-version": 4
},
{ {
"git-tree": "ca77eedd8dca92c9e6c021316e81b9c7f648b58a", "git-tree": "ca77eedd8dca92c9e6c021316e81b9c7f648b58a",
"version": "2.78.4", "version": "2.78.4",

5
versions/v-/vcpkg-tool-meson.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "43ebfc9a69d8e47fdfbe68b6f79a02d2b5f50e6e",
"version": "1.5.2",
"port-version": 0
},
{ {
"git-tree": "cdfb605662a81299245a1ea4a3659fab1ddaff70", "git-tree": "cdfb605662a81299245a1ea4a3659fab1ddaff70",
"version": "1.5.1", "version": "1.5.1",