From 2a617103266e8cc391197126fa16c29f65f13ca5 Mon Sep 17 00:00:00 2001
From: Sean Warren <s.warren@garvan.org.au>
Date: Mon, 23 Oct 2017 11:01:40 +1100
Subject: Remove non-numeric characters from Windows SDK version string See
 issue #1836, #2019

---
 scripts/cmake/vcpkg_get_windows_sdk.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

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
-- 
cgit v1.2.3