diff options
| author | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-06-01 21:09:01 +0300 |
|---|---|---|
| committer | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-08-02 01:38:09 +0300 |
| commit | b5489350abeaae55a303fcd6cf7c6b2094d91a4d (patch) | |
| tree | 1e5122fbc3ba7ede23dd379beff43771cc564f6b /ports/folly/fix-generators.patch | |
| parent | c22ab980bcab362134ef3e5db329a81c1767c2c9 (diff) | |
| download | vcpkg-b5489350abeaae55a303fcd6cf7c6b2094d91a4d.tar.gz vcpkg-b5489350abeaae55a303fcd6cf7c6b2094d91a4d.zip | |
[folly] Updated to version v2017.07.17.01
Diffstat (limited to 'ports/folly/fix-generators.patch')
| -rw-r--r-- | ports/folly/fix-generators.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/ports/folly/fix-generators.patch b/ports/folly/fix-generators.patch deleted file mode 100644 index e774b8c6b..000000000 --- a/ports/folly/fix-generators.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4c796ea..684f48f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,13 +1,5 @@ - cmake_minimum_required(VERSION 3.4.0 FATAL_ERROR) - --if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio 15( 2017)? Win64") -- set(MSVC_IS_2017 ON) --elseif ("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 14 2015 Win64") -- set(MSVC_IS_2017 OFF) --else() -- message(FATAL_ERROR "This build script only supports building Folly on 64-bit Windows with Visual Studio 2015 or Visual Studio 2017.") --endif() -- - # includes - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH}) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -@@ -24,10 +16,14 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) - - project(${PACKAGE_NAME} CXX) - --# Check architecture OS --if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8) -- message(FATAL_ERROR "Folly requires a 64bit OS") -+if (NOT MSVC_VERSION LESS 1910) -+ set(MSVC_IS_2017 ON) -+elseif (NOT MSVC_VERSION LESS 1900) -+ set(MSVC_IS_2017 OFF) -+else() -+ message(FATAL_ERROR "This build script only supports building Folly on 64-bit Windows with Visual Studio 2015 or Visual Studio 2017.") - endif() -+ - if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") - message(FATAL_ERROR "You should only be using CMake to build Folly if you are on Windows!") - endif() |