mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 01:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
* GENERATOR with Makefiles can build parallel

* resolved conflicts

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
day253 2022-10-09 12:48:41 +08:00 committed by GitHub
parent 3d8c3f5ec0
commit 11967e7797
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/vcpkg-cmake/vcpkg.json
View File

@ -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"
}

10
ports/vcpkg-cmake/vcpkg_cmake_build.cmake
View File

@ -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()

10
scripts/cmake/vcpkg_build_cmake.cmake
View File

@ -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()

2
versions/baseline.json
View File

@ -7637,7 +7637,7 @@
"port-version": 0
},
"vcpkg-cmake": {
"baseline": "2022-08-18",
"baseline": "2022-09-13",
"port-version": 0
},
"vcpkg-cmake-config": {

5
versions/v-/vcpkg-cmake.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "72b6903c393330b7c9042096d84cbd733619644e",
"version-date": "2022-09-13",
"port-version": 0
},
{
"git-tree": "84c200e8e625d4d99b1649525fcdf81a73197078",
"version-date": "2022-08-18",