diff --git a/ports/vcpkg-tool-meson/meson.template.in b/ports/vcpkg-tool-meson/meson.template.in index fb8d08431fd76e..59db4d43fdaaaa 100644 --- a/ports/vcpkg-tool-meson/meson.template.in +++ b/ports/vcpkg-tool-meson/meson.template.in @@ -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@ @@ -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 diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 2aad609f11c386..50398d18e1af26 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -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", diff --git a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake index 08c0187ec00b81..48fd9ba156dfe5 100644 --- a/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake +++ b/ports/vcpkg-tool-meson/vcpkg_configure_meson.cmake @@ -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) @@ -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}}") @@ -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}") diff --git a/versions/baseline.json b/versions/baseline.json index fc7df1aea9b046..6928cf0aa11225 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10526,7 +10526,7 @@ }, "vcpkg-tool-meson": { "baseline": "1.9.0", - "port-version": 5 + "port-version": 6 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index c93b29ea44f068..d7d520e5c7594d 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "959b8c5fa5c73a2e66d088fd6ae7cf4fd2d6fbae", + "version": "1.9.0", + "port-version": 6 + }, { "git-tree": "42508f7c39ca81723ba3486846883952f4b450db", "version": "1.9.0",