From e6552f118071a9798a2ffada7ae4707f3b29ed14 Mon Sep 17 00:00:00 2001 From: LRFLEW Date: Tue, 29 Jan 2019 14:43:39 -0700 Subject: [BZip2] Fix Unix Dynamic Builds (#5184) * [BZip2] Fix Unix Dynamic Builds * [bzip2] Bump control version * [libgta] Only build one flavor * [vcpkg_configure_cmake] Resolve #2375 since we now use CMake >= 3.11 --- scripts/cmake/vcpkg_configure_cmake.cmake | 3 --- 1 file changed, 3 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index cf3fc7861..f7b81de93 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -77,9 +77,6 @@ function(vcpkg_configure_cmake) elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility set(NINJA_CAN_BE_USED OFF) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - # Arm64 usage should be allowed once github issue #2375 is resolved - set(NINJA_CAN_BE_USED OFF) endif() if(_csc_GENERATOR) -- cgit v1.2.3