diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-09-11 19:57:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 10:57:47 -0700 |
| commit | 59115f6e3a8efe55f24ec224fd61abdfb8bfc604 (patch) | |
| tree | f0a4f75f59851dbdc8a6a6164e11b6cc48ae2108 /scripts/buildsystems | |
| parent | 18ab4b72a26284f0df28295ce7bf9b21c96f20f4 (diff) | |
| download | vcpkg-59115f6e3a8efe55f24ec224fd61abdfb8bfc604.tar.gz vcpkg-59115f6e3a8efe55f24ec224fd61abdfb8bfc604.zip | |
[vcpkg|toolchain] add VCPKG_OVERLAY_(PORTS|TRIPLETS) to the toolchain (#13240)
* add VCPKG_OVERLAY_(PORTS|TRIPLETS) to the toolchain
* move everything into additional manifest params
* fix me not thinking
Diffstat (limited to 'scripts/buildsystems')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index f2e89c5db..1b46771b1 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -329,15 +329,31 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE) message(STATUS "Bootstrapping vcpkg before install - done") endif() + set(VCPKG_OVERLAY_PORTS "" CACHE STRING "Overlay ports to use for vcpkg install in manifest mode") + mark_as_advanced(VCPKG_OVERLAY_PORTS) + set(VCPKG_OVERLAY_TRIPLETS "" CACHE STRING "Overlay triplets to use for vcpkg install in manifest mode") + mark_as_advanced(VCPKG_OVERLAY_TRIPLETS) + message(STATUS "Running vcpkg install") - set(_VCPKG_MANIFEST_FEATURES) + set(_VCPKG_ADDITIONAL_MANIFEST_PARAMS) + if(VCPKG_OVERLAY_PORTS) + foreach(_overlay_port IN LISTS VCPKG_OVERLAY_PORTS) + list(APPEND _VCPKG_ADDITIONAL_MANIFEST_PARAMS "--overlay-ports=${_overlay_port}") + endforeach() + endif() + if(VCPKG_OVERLAY_TRIPLETS) + foreach(_overlay_triplet IN LISTS VCPKG_OVERLAY_TRIPLETS) + list(APPEND _VCPKG_ADDITIONAL_MANIFEST_PARAMS "--overlay-triplets=${_overlay_triplet}") + endforeach() + endif() + foreach(feature ${VCPKG_MANIFEST_FEATURES}) - list(APPEND _VCPKG_MANIFEST_FEATURES "--x-feature=${feature}") + list(APPEND _VCPKG_ADDITIONAL_MANIFEST_PARAMS "--x-feature=${feature}") endforeach() if(VCPKG_MANIFEST_NO_DEFAULT_FEATURES) - set(_VCPKG_MANIFEST_NO_DEFAULT_FEATURES "--x-no-default-features") + list(APPEND _VCPKG_ADDITIONAL_MANIFEST_PARAMS "--x-no-default-features") endif() execute_process( @@ -346,8 +362,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT _CMAKE_IN_TRY_COMPILE) --vcpkg-root "${_VCPKG_ROOT_DIR}" "--x-manifest-root=${_VCPKG_MANIFEST_DIR}" "--x-install-root=${_VCPKG_INSTALLED_DIR}" - ${_VCPKG_MANIFEST_FEATURES} - ${_VCPKG_MANIFEST_NO_DEFAULT_FEATURES} + ${_VCPKG_ADDITIONAL_MANIFEST_PARAMS} RESULT_VARIABLE _VCPKG_INSTALL_RESULT) if (NOT _VCPKG_INSTALL_RESULT EQUAL 0) |