diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-22 00:33:28 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-06-28 13:30:40 -0700 |
| commit | 52d5091f85d182abb9b6581cfbb8b73909da1696 (patch) | |
| tree | 725b5c8d2a77415b8749e47cb9711ec7ee039bfd | |
| parent | 6c9d51451091470a6414a1e466a1f6f6d9b870ff (diff) | |
| download | vcpkg-52d5091f85d182abb9b6581cfbb8b73909da1696.tar.gz vcpkg-52d5091f85d182abb9b6581cfbb8b73909da1696.zip | |
[angle] Disable static builds
| -rw-r--r-- | ports/angle/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ports/angle/portfile.cmake | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index 4f4138a05..a4895f938 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -91,7 +91,6 @@ file(GLOB_RECURSE LIBANGLE_D3D_SOURCES "src/libANGLE/renderer/d3d/*.h" "src/libA list(FILTER LIBANGLE_SOURCES EXCLUDE REGEX "_unittest")
list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "_unittest|winrt")
add_library(libANGLE STATIC ${LIBANGLE_SOURCES} ${LIBANGLE_D3D_SOURCES})
-# kernel32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib;d3d9.lib;dxguid.lib
find_library(D3D9_LIB NAMES d3d9)
find_library(DXGUID_LIB NAMES dxguid)
target_link_libraries(libANGLE PRIVATE angle_common angle_image_util translator ${D3D9_LIB} ${DXGUID_LIB} preprocessor)
diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index 1499fa623..4668b7dea 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -1,5 +1,10 @@ include(vcpkg_common_functions)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ message(STATUS "ANGLE currently only supports being built as a dynamic library")
+ set(VCPKG_LIBRARY_LINKAGE dynamic)
+endif()
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/angle
|