From fa3f9dd9628ebafd3ba65fb3abde6c1d6f0448fc Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 21 Feb 2017 23:22:56 -0800
Subject: [PATCH] [opengl] Add -ExecutionPolicy Bypass when invoking powershell
 as a child process.

---
 ports/opengl/CONTROL                      | 2 +-
 ports/opengl/portfile.cmake               | 5 ++---
 scripts/cmake/vcpkg_get_windows_sdk.cmake | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ports/opengl/CONTROL b/ports/opengl/CONTROL
index 5a9e200cae6..db748df59ab 100644
--- a/ports/opengl/CONTROL
+++ b/ports/opengl/CONTROL
@@ -1,3 +1,3 @@
 Source: opengl
-Version: 0.0-1
+Version: 0.0-2
 Description: Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics.
\ No newline at end of file
diff --git a/ports/opengl/portfile.cmake b/ports/opengl/portfile.cmake
index b29fef60a2d..cc27570e6fc 100644
--- a/ports/opengl/portfile.cmake
+++ b/ports/opengl/portfile.cmake
@@ -3,7 +3,7 @@ include(vcpkg_common_functions)
 vcpkg_get_program_files_32_bit(PROGRAM_FILES_32_BIT)
 vcpkg_get_windows_sdk(WINDOWS_SDK)
 
-if (${WINDOWS_SDK} STREQUAL "10")
+if (WINDOWS_SDK MATCHES "10.")
     set(OPENGLPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\OpenGL32.Lib")
     set(LICENSEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Licenses\\${WINDOWS_SDK}\\sdk_license.rtf")
     set(HEADERSPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Include\\${WINDOWS_SDK}\\um")
@@ -23,11 +23,10 @@ file(MAKE_DIRECTORY
     ${CURRENT_PACKAGES_DIR}/share/opengl
 )
 
-file(COPY ${LICENSEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/include/gl)
 file(COPY
     "${HEADERSPATH}\\gl\\GL.h"
     "${HEADERSPATH}\\gl\\GLU.h"
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include/gl
     )
 file(COPY ${OPENGLPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 file(COPY ${OPENGLPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
diff --git a/scripts/cmake/vcpkg_get_windows_sdk.cmake b/scripts/cmake/vcpkg_get_windows_sdk.cmake
index 6dde6f0c76c..7a8014eb25e 100644
--- a/scripts/cmake/vcpkg_get_windows_sdk.cmake
+++ b/scripts/cmake/vcpkg_get_windows_sdk.cmake
@@ -1,6 +1,6 @@
 function(vcpkg_get_windows_sdk ret)
     execute_process(
-        COMMAND powershell.exe ${VCPKG_ROOT_DIR}/scripts/getWindowsSDK.ps1
+        COMMAND powershell.exe -ExecutionPolicy Bypass ${VCPKG_ROOT_DIR}/scripts/getWindowsSDK.ps1
         OUTPUT_VARIABLE WINDOWS_SDK
         RESULT_VARIABLE error_code)