From 11967e7797ea18a99c1950cf9f651c5793aae8e9 Mon Sep 17 00:00:00 2001 From: day253 <9634619+day253@users.noreply.github.com> Date: Sun, 9 Oct 2022 12:48:41 +0800 Subject: [PATCH] [vcpkg] GENERATOR with Makefiles can build parallel (#26780) * GENERATOR with Makefiles can build parallel * resolved conflicts Co-authored-by: JackBoosY --- ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_build.cmake | 10 +++++----- scripts/cmake/vcpkg_build_cmake.cmake | 10 +++++----- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 +++++ 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index f6f66b21a4..741394d5be 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-cmake", - "version-date": "2022-08-18", + "version-date": "2022-09-13", "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake index efdb194fa1..47933b3fe9 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake @@ -26,12 +26,12 @@ function(vcpkg_cmake_build) elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") # No options are currently added for nmake builds elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") - vcpkg_list(SET build_args "VERBOSE=1") - vcpkg_list(SET parallel_args "-j${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_args "") + vcpkg_list(SET build_param "VERBOSE=1") + vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param "") elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") - vcpkg_list(SET parallel_args -jobs "${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_args -jobs 1) + vcpkg_list(SET parallel_param -jobs "${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param -jobs 1) else() message(WARNING "Unrecognized GENERATOR setting from vcpkg_cmake_configure().") endif() diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake index 592f6508ee..8a8c25ebc5 100644 --- a/scripts/cmake/vcpkg_build_cmake.cmake +++ b/scripts/cmake/vcpkg_build_cmake.cmake @@ -30,12 +30,12 @@ function(vcpkg_build_cmake) elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") # No options are currently added for nmake builds elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") - vcpkg_list(SET build_args "VERBOSE=1") - vcpkg_list(SET parallel_args "-j${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_args "") + vcpkg_list(SET build_param "VERBOSE=1") + vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param "") elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") - vcpkg_list(SET parallel_args -jobs "${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_args -jobs 1) + vcpkg_list(SET parallel_param -jobs "${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param -jobs 1) else() message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles") endif() diff --git a/versions/baseline.json b/versions/baseline.json index 93141b57d5..d388dec67a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7637,7 +7637,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2022-08-18", + "baseline": "2022-09-13", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 93f0c66974..f1bdb7e134 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72b6903c393330b7c9042096d84cbd733619644e", + "version-date": "2022-09-13", + "port-version": 0 + }, { "git-tree": "84c200e8e625d4d99b1649525fcdf81a73197078", "version-date": "2022-08-18",