aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorpastdue <30942300+past-due@users.noreply.github.com>2021-06-08 12:50:09 -0400
committerGitHub <noreply@github.com>2021-06-08 09:50:09 -0700
commit38d2893b30d4d4b3c09485216ecf4f6e8ef35d88 (patch)
treeb2a2161d3680b01fb6649991d290ce8c88e8587b /scripts
parent31993541c33bf8d3ffe6d664a36c846c63286c09 (diff)
downloadvcpkg-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 'scripts')
-rw-r--r--scripts/cmake/vcpkg_configure_make.cmake11
1 files changed, 11 insertions, 0 deletions
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake
index 770678394..86b42a173 100644
--- a/scripts/cmake/vcpkg_configure_make.cmake
+++ b/scripts/cmake/vcpkg_configure_make.cmake
@@ -512,6 +512,17 @@ function(vcpkg_configure_make)
list(APPEND _csc_OPTIONS --disable-shared --enable-static)
endif()
+ # Can be set in the triplet to append options for configure
+ if(DEFINED VCPKG_MAKE_CONFIGURE_OPTIONS)
+ list(APPEND _csc_OPTIONS ${VCPKG_MAKE_CONFIGURE_OPTIONS})
+ endif()
+ if(DEFINED VCPKG_MAKE_CONFIGURE_OPTIONS_RELEASE)
+ list(APPEND _csc_OPTIONS_RELEASE ${VCPKG_MAKE_CONFIGURE_OPTIONS_RELEASE})
+ endif()
+ if(DEFINED VCPKG_MAKE_CONFIGURE_OPTIONS_DEBUG)
+ list(APPEND _csc_OPTIONS_DEBUG ${VCPKG_MAKE_CONFIGURE_OPTIONS_DEBUG})
+ endif()
+
file(RELATIVE_PATH RELATIVE_BUILD_PATH "${CURRENT_BUILDTREES_DIR}" "${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH}")
set(base_cmd)