diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md index 51a96372f8..b8f9c3b8ab 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md @@ -20,6 +20,8 @@ and this is something we recommend doing whenever possible. Otherwise, you can use `TARGET` to set the target to build. This function defaults to not passing a target to cmake. +[`vcpkg_cmake_install()`]: vcpkg_cmake_install.md + `LOGFILE_BASE` is used to set the base of the logfile names; by default, this is `build`, and thus the logfiles end up being something like `build-x86-windows-dbg.log`; if you use `vcpkg_cmake_install`, diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md index 6053b363c6..fd84c25290 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md @@ -87,7 +87,7 @@ This command supplies many common arguments to CMake. To see the full list, exam * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) +* [opencv4](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv4/portfile.cmake) ## Source [ports/vcpkg-cmake/vcpkg\_cmake\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake) diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md index 29ac265aa6..1d708d3a13 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md @@ -15,7 +15,7 @@ vcpkg_cmake_install( with additional parameters to set the `TARGET` to `install`, and to set the `LOGFILE_ROOT` to `install` as well. -[`vcpkg_cmake_build()`]: vcpkg_cmake_build.cmake +[`vcpkg_cmake_build()`]: vcpkg_cmake_build.md ## Examples: diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index bc765f2a3a..0061a046ea 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake", - "version-date": "2021-12-20" + "version-date": "2022-01-19" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake index ef27a6c91b..5520f0de31 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake @@ -19,6 +19,8 @@ and this is something we recommend doing whenever possible. Otherwise, you can use `TARGET` to set the target to build. This function defaults to not passing a target to cmake. +[`vcpkg_cmake_install()`]: vcpkg_cmake_install.md + `LOGFILE_BASE` is used to set the base of the logfile names; by default, this is `build`, and thus the logfiles end up being something like `build-x86-windows-dbg.log`; if you use `vcpkg_cmake_install`, @@ -46,10 +48,10 @@ function(vcpkg_cmake_build) set(arg_LOGFILE_BASE "build") endif() - set(build_args) - set(target_args) - set(parallel_args) - set(no_parallel_args) + set(build_args "") + set(target_args "") + set(parallel_args "") + set(no_parallel_args "") if(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Ninja") set(build_args "-v") # verbose output @@ -63,8 +65,15 @@ function(vcpkg_cmake_build) set(parallel_args "/m") elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "NMake Makefiles") # No options are currently added for nmake builds + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") + set(build_args "VERBOSE=1") + set(parallel_args "-j${VCPKG_CONCURRENCY}") + set(no_parallel_args "") + elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") + list(APPEND parallel_args -jobs "${VCPKG_CONCURRENCY}") + list(APPEND no_parallel_args -jobs 1) else() - message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles") + message(WARNING "Unrecognized GENERATOR setting from vcpkg_cmake_configure().") endif() if(DEFINED arg_TARGET) diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index b5241d5270..95ee7e23ea 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -86,7 +86,7 @@ This command supplies many common arguments to CMake. To see the full list, exam * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake) * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake) -* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) +* [opencv4](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv4/portfile.cmake) #]===] if(Z_VCPKG_CMAKE_CONFIGURE_GUARD) return() diff --git a/ports/vcpkg-cmake/vcpkg_cmake_install.cmake b/ports/vcpkg-cmake/vcpkg_cmake_install.cmake index 0a609aa8da..6eddcfb912 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_install.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_install.cmake @@ -14,7 +14,7 @@ vcpkg_cmake_install( with additional parameters to set the `TARGET` to `install`, and to set the `LOGFILE_ROOT` to `install` as well. -[`vcpkg_cmake_build()`]: vcpkg_cmake_build.cmake +[`vcpkg_cmake_build()`]: vcpkg_cmake_build.md ## Examples: diff --git a/versions/baseline.json b/versions/baseline.json index 6e5be7413f..881b85f99d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7165,7 +7165,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2021-12-20", + "baseline": "2022-01-19", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index b5d88488d4..b61a6fe25f 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7c050fe60f91dcedef6d87a3f87584151bf8aee", + "version-date": "2022-01-19", + "port-version": 0 + }, { "git-tree": "a35eb7c761372dc64526d59fa918a13c0dfbba1b", "version-date": "2021-12-20",