Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/jack/upgrade_libi

4 files changed, 40 insertions, 11 deletions

diff --git a/ports/angle/002-fix-builder-error.patch b/ports/angle/002-fix-builder-error.patch
new file mode 100644
index 000000000..db70f9fdc
--- /dev/null
+++ b/ports/angle/002-fix-builder-error.patch
@@ -0,0 +1,30 @@
+diff --git a/src/gpu_info_util/SystemInfo_win.cpp b/src/gpu_info_util/SystemInfo_win.cpp
+index 878f0f5..2255982 100644
+--- a/src/gpu_info_util/SystemInfo_win.cpp
++++ b/src/gpu_info_util/SystemInfo_win.cpp
+@@ -4,6 +4,12 @@
+ // found in the LICENSE file.
+ //
+ 
++// Windows.h needs to be included first
++#include <windows.h>
++
++#include <d3d10.h>
++#include <dxgi.h>
++
+ // SystemInfo_win.cpp: implementation of the Windows-specific parts of SystemInfo.h
+ 
+ #include "gpu_info_util/SystemInfo_internal.h"
+@@ -11,12 +17,6 @@
+ #include "common/debug.h"
+ #include "common/string_utils.h"
+ 
+-// Windows.h needs to be included first
+-#include <windows.h>
+-
+-#include <d3d10.h>
+-#include <dxgi.h>
+-
+ #include <array>
+ #include <sstream>
+ 
diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt
index 8be51c0d4..83850b54f 100644
--- a/ports/angle/CMakeLists.txt
+++ b/ports/angle/CMakeLists.txt
@@ -14,7 +14,7 @@ else()
 endif()

 

 if(MSVC)

-    add_compile_options(/d2guard4 /Wv:18 /guard:cf /permissive)

+    add_compile_options(/d2guard4 /Wv:18 /guard:cf /permissive /bigobj)

 else()

     set(CMAKE_CXX_STANDARD 17)

     set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL
index e0b0a5f6d..1a919f3fc 100644
--- a/ports/angle/CONTROL
+++ b/ports/angle/CONTROL
@@ -1,6 +1,6 @@
-Source: angle

-Version: 2019-07-19-2
-Homepage: https://github.com/google/angle

-Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.

-  The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.

-Build-Depends: egl-registry

+Source: angle
+Version: 2019-07-19-4
+Homepage: https://github.com/google/angle
+Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
+  The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
+Build-Depends: egl-registry
diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake
index 527874d72..c3f27eb4e 100644
--- a/ports/angle/portfile.cmake
+++ b/ports/angle/portfile.cmake
@@ -1,8 +1,6 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if (VCPKG_TARGET_IS_LINUX)
     message(WARNING "Building with a gcc version less than 6.1 is not supported.")
 endif()
 
@@ -23,6 +21,7 @@ vcpkg_from_github(
     SHA512 037ebe356371924088563180c4a37a31eaffa41ca21c42554391672c28e62fabc19d787516b88baa192b771e05c370c5a6cfec0863b70e08d65216f41d89923f
     PATCHES 
         001-fix-uwp.patch
+        002-fix-builder-error.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -42,4 +41,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/u
 
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angle RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)