diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 7052cc9831f498..1371cf191d35ba 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-cmake", - "version-date": "2022-12-22", + "version-date": "2023-04-21", "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 746991f983d67d..cc3f00c49acafc 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -159,6 +159,7 @@ function(vcpkg_cmake_configure) vcpkg_list(APPEND arg_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" + "-DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}" "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}" "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 15496ce45a5f11..c72c59519ca1bf 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -423,7 +423,6 @@ function(z_vcpkg_add_vcpkg_to_cmake_path list suffix) endif() set("${list}" "${${list}}" PARENT_SCOPE) endfunction() -z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_PREFIX_PATH "") z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_LIBRARY_PATH "/lib/manual-link") z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_FIND_ROOT_PATH "") @@ -559,6 +558,7 @@ if(VCPKG_SETUP_CMAKE_PROGRAM_PATH) set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") if(VCPKG_USE_HOST_TOOLS) set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools") + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) endif() list(APPEND CMAKE_PROGRAM_PATH "${tools_base_path}") file(GLOB Z_VCPKG_TOOLS_DIRS LIST_DIRECTORIES true "${tools_base_path}/*") diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 24c64a6ec11264..5de364ef76f83c 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -215,6 +215,7 @@ function(vcpkg_configure_cmake) vcpkg_list(APPEND arg_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" + "-DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}" "-DVCPKG_SET_CHARSET_FLAG=${vcpkg_set_charset_flag}" "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" diff --git a/versions/baseline.json b/versions/baseline.json index cda61ff29ab439..e0997a65a0f0e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8217,7 +8217,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2022-12-22", + "baseline": "2023-04-21", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 50bf5211394920..cbcb7afd60cdc2 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4e8f64fa8f5537fc85345279dbb5b33a85e642e", + "version-date": "2023-04-21", + "port-version": 0 + }, { "git-tree": "1913f86defd2140d0a6751be2d51952e4090efa4", "version-date": "2022-12-22",