[vcpkg] GENERATOR with Makefiles can build parallel (#26780)

* GENERATOR with Makefiles can build parallel * resolved conflicts Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
microsoft · Oct 9, 2022 · 11967e7 · 11967e7
1 parent 3d8c3f5
commit 11967e7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "72b6903c393330b7c9042096d84cbd733619644e",
+      "version-date": "2022-09-13",
+      "port-version": 0
+    },
     {
       "git-tree": "84c200e8e625d4d99b1649525fcdf81a73197078",
       "version-date": "2022-08-18",