Skip to content

[vcpkg-tool-meson] Fixes for additional languages #51492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ajtribick wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −7
Draft

[vcpkg-tool-meson] Fixes for additional languages #51492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ports/vcpkg-tool-meson/meson.template.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ pkg-config = ['@PKGCONFIG@']
@MESON_CXX_LD@
@MESON_OBJC@
@MESON_OBJC_LD@
@MESON_OBJCPP@
@MESON_OBJCPP_LD@
@MESON_OBJCXX@
@MESON_OBJCXX_LD@
@MESON_FC@
@MESON_FC_LD@
@MESON_WINDRES@
Expand All @@ -36,7 +36,7 @@ werror = false
@MESON_CXXFLAGS@
@MESON_FCFLAGS@
@MESON_OBJCFLAGS@
@MESON_OBJCPPFLAGS@
@MESON_OBJCXXFLAGS@
# b_vscrt
@MESON_VSCRT_LINKAGE@
# c_winlibs/cpp_winlibs
Expand Down
2 changes: 1 addition & 1 deletion ports/vcpkg-tool-meson/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vcpkg-tool-meson",
"version": "1.9.0",
"port-version": 5,
"port-version": 6,
"description": "Meson build system",
"homepage": "https://github.com/mesonbuild/meson",
"license": "Apache-2.0",
Expand Down
6 changes: 4 additions & 2 deletions ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ function(z_vcpkg_meson_set_proglist_variables config_type)
set(meson_RC windres)
set(meson_Fortran fortran)
set(meson_CXX cpp)
set(meson_OBJCXX objcpp)
foreach(prog IN LISTS compilers)
if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER)
string(TOUPPER "MESON_${prog}" var_to_set)
Expand Down Expand Up @@ -111,6 +112,8 @@ function(z_vcpkg_meson_set_flags_variables config_type)
string(TOLOWER "${lang_mapping}" langlower)
if(lang STREQUAL "CXX")
set(langlower cpp)
elseif(lang STREQUAL "OBJCXX")
set(langlower objcpp)
endif()
set(MESON_${lang_mapping}FLAGS "${langlower}_args = ${${lang}flags}\n")
set(linker_flags "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${config_type}}")
Expand Down Expand Up @@ -345,8 +348,7 @@ function(vcpkg_generate_meson_cmd_args)
if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
z_vcpkg_select_default_vcpkg_chainload_toolchain()
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 ADDITIONAL_LANGUAGES ${arg_LANGUAGES})
debug_message("Including cmake vars from: ${cmake_vars_file}")
include("${cmake_vars_file}")

Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10526,7 +10526,7 @@
},
"vcpkg-tool-meson": {
"baseline": "1.9.0",
"port-version": 5
"port-version": 6
},
"vcpkg-tool-mozbuild": {
"baseline": "4.0.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vcpkg-tool-meson.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "959b8c5fa5c73a2e66d088fd6ae7cf4fd2d6fbae",
"version": "1.9.0",
"port-version": 6
},
{
"git-tree": "42508f7c39ca81723ba3486846883952f4b450db",
"version": "1.9.0",
Expand Down