Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix vcpkg_configure_cmake for case when having semicolons in OPTIONS #12977

Merged
merged 13 commits into from
Aug 24, 2020
Merged

fix vcpkg_configure_cmake for case when having semicolons in OPTIONS #12977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d3121ce
Merge pull request #1 from microsoft/master
jgehw Aug 17, 2020
b1d9f9b
fix #4320
Aug 18, 2020
c743e49
Revert "incorporate changes from microsoft:master"
jgehw Aug 18, 2020
2571bd1
Merge pull request #2 from jgehw/revert-1-master
jgehw Aug 18, 2020
98ecc0c
Revert "Revert "incorporate changes from microsoft:master""
jgehw Aug 18, 2020
ab8fdf7
Merge branch 'master' of https://github.com/microsoft/vcpkg
Aug 18, 2020
36143ac
Merge branch 'master' of https://github.com/microsoft/vcpkg
Aug 20, 2020
09e6c3e
merge branch 'master' into 'fix-vcpkg-configure-cmake' to resolve CI …
Aug 20, 2020
7c3ecc0
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Aug 20, 2020
1866a82
Merge branch 'master' of https://github.com/microsoft/vcpkg
Aug 21, 2020
ecfeff9
merge branch 'master' into 'fix-vcpkg-configure-cmake' to resolve fur…
Aug 21, 2020
3827f3c
fix usage of vcpkg_configure_cmake()
Aug 21, 2020
ffe3253
Merge branch 'fix-vcpkg-configure-cmake' of https://github.com/jgehw/…
Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/lapack-reference/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ vcpkg_configure_cmake(
OPTIONS
"-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}"
"-DCBLAS=${CBLAS}"
"${FORTRAN_CMAKE}"
${FORTRAN_CMAKE}
)

vcpkg_install_cmake()
Expand Down
4 changes: 2 additions & 2 deletions scripts/cmake/vcpkg_configure_cmake.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@
## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake)
## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.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"
"SOURCE_PATH;GENERATOR"
"OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE"
${ARGN}
)

if(NOT VCPKG_PLATFORM_TOOLSET)
Expand Down