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

[scripts] Fix wasm builds (#39106)

Browse Source
This commit is contained in:
Alexander Neumann 2024-06-29 02:28:34 +02:00 committed by GitHub
parent cc4595b8a3
commit 1b72637922
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{
"name": "vcpkg-tool-meson",
"version": "1.3.2",
"port-version": 7,
"port-version": 8,
"description": "Meson build system",
"homepage": "https://github.com/mesonbuild/meson",
"license": "Apache-2.0",

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

@ -42,7 +42,9 @@ function(z_vcpkg_meson_set_proglist_variables config_type)
list(FILTER ${prog}flags EXCLUDE REGEX "(-|/)nologo") # Breaks compiler detection otherwise
z_vcpkg_meson_convert_list_to_python_array(${prog}flags ${${prog}flags})
set("${var_to_set}" "${meson_${prog}} = ${${prog}flags}" PARENT_SCOPE)
if (DEFINED VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID AND NOT VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID MATCHES "^(GNU|Intel)$")
if (DEFINED VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID
AND NOT VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID MATCHES "^(GNU|Intel)$"
AND VCPKG_DETECTED_CMAKE_LINKER)
string(TOUPPER "MESON_${prog}_LD" var_to_set)
set(${var_to_set} "${meson_${prog}}_ld = ['${VCPKG_DETECTED_CMAKE_LINKER}']" PARENT_SCOPE)
endif()
@ -56,7 +58,9 @@ function(z_vcpkg_meson_set_proglist_variables config_type)
z_vcpkg_meson_convert_list_to_python_array(${prog}flags ${${prog}flags})
string(TOLOWER "${prog}" proglower)
set("${var_to_set}" "${proglower} = ${${prog}flags}" PARENT_SCOPE)
if (DEFINED VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID AND NOT VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID MATCHES "^(GNU|Intel)$")
if (DEFINED VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID
AND NOT VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID MATCHES "^(GNU|Intel)$"
AND VCPKG_DETECTED_CMAKE_LINKER)
string(TOUPPER "MESON_${prog}_LD" var_to_set)
set(${var_to_set} "${proglower}_ld = ['${VCPKG_DETECTED_CMAKE_LINKER}']" PARENT_SCOPE)
endif()

3
scripts/cmake/vcpkg_configure_make.cmake
View File

@ -552,6 +552,9 @@ function(vcpkg_configure_make)
# OSX dosn't like CMAKE_C(XX)_COMPILER (cc) in CC/CXX and rather wants to have gcc/g++
vcpkg_list(SET z_vcm_all_tools)
function(z_vcpkg_make_set_env envvar cmakevar)
if(NOT VCPKG_DETECTED_CMAKE_${cmakevar})
return()
endif()
set(prog "${VCPKG_DETECTED_CMAKE_${cmakevar}}")
if(NOT DEFINED ENV{${envvar}} AND NOT prog STREQUAL "")
vcpkg_list(APPEND z_vcm_all_tools "${prog}")

2
versions/baseline.json
View File

@ -9178,7 +9178,7 @@
},
"vcpkg-tool-meson": {
"baseline": "1.3.2",
"port-version": 7
"port-version": 8
},
"vcpkg-tool-mozbuild": {
"baseline": "4.0.2",

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

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "22011ab1f929bf881c5521272ee0818cb75dee1c",
"version": "1.3.2",
"port-version": 8
},
{
"git-tree": "3516ee436fc923a7ac6344886ff394e80ebc6e09",
"version": "1.3.2",