diff options
| author | pastdue <30942300+past-due@users.noreply.github.com> | 2021-06-08 12:50:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 09:50:09 -0700 |
| commit | 38d2893b30d4d4b3c09485216ecf4f6e8ef35d88 (patch) | |
| tree | b2a2161d3680b01fb6649991d290ce8c88e8587b /ports | |
| parent | 31993541c33bf8d3ffe6d664a36c846c63286c09 (diff) | |
| download | vcpkg-38d2893b30d4d4b3c09485216ecf4f6e8ef35d88.tar.gz vcpkg-38d2893b30d4d4b3c09485216ecf4f6e8ef35d88.zip | |
Add VCPKG_MAKE_CONFIGURE_OPTIONS (that can be set in the triplet) (#18132)
* Add VCPKG_MAKE_CONFIGURE_OPTIONS that can be set in the triplet
To append options to the configure command
* Add documentation
* Expand without quotes
Co-Authored-By: ras0219 <533828+ras0219@users.noreply.github.com>
* Add VCPKG_CMAKE_CONFIGURE_OPTIONS that can be set in the triplet
Co-Authored-By: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Bump vcpkg-cmake port-version
* Run x-add-version vcpkg-cmake
* Apply suggestions from code review
* [vcpkg-cmake] add version
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/vcpkg-cmake/vcpkg.json | 2 | ||||
| -rw-r--r-- | ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 710d38e62..8e2ac9ec6 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", "version-date": "2021-02-28", - "port-version": 2 + "port-version": 3 } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 3b7d31eff..acc6f3655 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -293,6 +293,17 @@ function(vcpkg_cmake_configure) endif() endforeach() + # Allow overrides / additional configuration variables from triplets + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS) + list(APPEND arg_OPTIONS "${VCPKG_CMAKE_CONFIGURE_OPTIONS}") + endif() + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE) + list(APPEND arg_OPTIONS_RELEASE "${VCPKG_CMAKE_CONFIGURE_OPTIONS_RELEASE}") + endif() + if(DEFINED VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG) + list(APPEND arg_OPTIONS_DEBUG "${VCPKG_CMAKE_CONFIGURE_OPTIONS_DEBUG}") + endif() + if(ninja_host AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") |