diff options
| author | Sean Warren <s.warren@garvan.org.au> | 2017-10-23 11:01:40 +1100 |
|---|---|---|
| committer | Sean Warren <s.warren@garvan.org.au> | 2017-10-23 11:01:40 +1100 |
| commit | 2a617103266e8cc391197126fa16c29f65f13ca5 (patch) | |
| tree | d9f83868801acb9648a5f95c1059262be99e54f1 /scripts | |
| parent | deee8c1743af2d851d48d42b7ac91558c8fefb5a (diff) | |
| download | vcpkg-2a617103266e8cc391197126fa16c29f65f13ca5.tar.gz vcpkg-2a617103266e8cc391197126fa16c29f65f13ca5.zip | |
Remove non-numeric characters from Windows SDK version string
See issue #1836, #2019
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_get_windows_sdk.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_get_windows_sdk.cmake b/scripts/cmake/vcpkg_get_windows_sdk.cmake index 64d8838e7..a8aad64a9 100644 --- a/scripts/cmake/vcpkg_get_windows_sdk.cmake +++ b/scripts/cmake/vcpkg_get_windows_sdk.cmake @@ -10,7 +10,7 @@ function(vcpkg_get_windows_sdk ret) message(FATAL_ERROR "Could not find Windows SDK") endif() - # Remove trailing newline - string(REGEX REPLACE "\n$" "" WINDOWS_SDK "${WINDOWS_SDK}") + # Remove trailing newline and non-numeric characters + string(REGEX REPLACE "[^0-9.]" "" WINDOWS_SDK "${WINDOWS_SDK}") set(${ret} ${WINDOWS_SDK} PARENT_SCOPE) endfunction()
\ No newline at end of file |