diff options
| author | jgehw <44170764+jgehw@users.noreply.github.com> | 2020-08-24 21:32:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 12:32:34 -0700 |
| commit | 02bfa2961ad0bc06efd2540b14f14659ad158177 (patch) | |
| tree | 4941f037faace62652595a5300d45a5ac5e365c6 | |
| parent | 15e886daeb067f775800b0447e6bfe172e779175 (diff) | |
| download | vcpkg-02bfa2961ad0bc06efd2540b14f14659ad158177.tar.gz vcpkg-02bfa2961ad0bc06efd2540b14f14659ad158177.zip | |
fix vcpkg_configure_cmake for case when having semicolons in OPTIONS (#12977)
| -rw-r--r-- | ports/lapack-reference/portfile.cmake | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 1e3f8d6b6..dcdce397a 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -59,7 +59,7 @@ vcpkg_configure_cmake( OPTIONS
"-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}"
"-DCBLAS=${CBLAS}"
- "${FORTRAN_CMAKE}"
+ ${FORTRAN_CMAKE}
)
vcpkg_install_cmake()
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 9f75c5e07..ce534b7aa 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -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) |