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

fix vcpkg_configure_cmake for case when having semicolons in OPTIONS (#12977)

Browse Source
This commit is contained in:
jgehw 2020-08-24 21:32:34 +02:00 committed by GitHub
parent 15e886daeb
commit 02bfa2961a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/lapack-reference/portfile.cmake
View File

@ -59,7 +59,7 @@ vcpkg_configure_cmake(
OPTIONS OPTIONS
"-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}"
"-DCBLAS=${CBLAS}" "-DCBLAS=${CBLAS}"
"${FORTRAN_CMAKE}" ${FORTRAN_CMAKE}
) )
vcpkg_install_cmake() vcpkg_install_cmake()

4
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -59,11 +59,11 @@
## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/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) ## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
function(vcpkg_configure_cmake) function(vcpkg_configure_cmake)
cmake_parse_arguments(_csc # parse parameters such that semicolons in arguments to OPTIONS don't get erased
cmake_parse_arguments(PARSE_ARGV 0 _csc
"PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG" "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG"
"SOURCE_PATH;GENERATOR" "SOURCE_PATH;GENERATOR"
"OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE"
${ARGN}
) )
if(NOT VCPKG_PLATFORM_TOOLSET) if(NOT VCPKG_PLATFORM_TOOLSET)