mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 08:48:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Fix incorrect setting of FEATURE_OPTIONS (#7158)

Browse Source 
Setting a variable in PARENT_SCOPE will not make the variable also visible in
current scope, which, as a result, causes FEATURE_OPTIONS to be set incorrectly.
This commit is contained in:
myd7349 2019-07-07 15:33:46 +08:00 committed by Phil Christensen
parent 4f6f7f8fbc
commit 1053d5b386
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/cmake/vcpkg_check_features.cmake
View File

@ -94,12 +94,12 @@ function(vcpkg_check_features)
if(${_vcf_FEATURE} IN_LIST FEATURES)
set(${_vcf_FEATURE_VAR} ON PARENT_SCOPE)
list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VAR}=ON")
else()
set(${_vcf_FEATURE_VAR} OFF PARENT_SCOPE)
list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VAR}=OFF")
endif()
list(APPEND _vcf_FEATURE_OPTIONS "-D${_vcf_FEATURE_VAR}=${${_vcf_FEATURE_VAR}}")
set(_vcf_IS_FEATURE_ARG ON)
endif()
endforeach()