mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:06:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[eastl]Add option(/Zc:char8_t-) to fix compile issue (#6360)

Browse Source
This commit is contained in:
LarryIII 2019-05-10 06:14:38 +08:00 committed by Phil Christensen
parent e2f45664c9
commit 64f8fb7b86
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/eastl/CONTROL
View File

@ -1,4 +1,4 @@
Source: eastl Source: eastl
Version: 3.13.05 Version: 3.13.05-1
Description: Electronic Arts Standard Template Library. Description: Electronic Arts Standard Template Library.
It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.

13
ports/eastl/fixchar8_t.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake
index 566fbee..4fcca61 100644
--- a/scripts/CMake/CommonCppFlags.cmake
+++ b/scripts/CMake/CommonCppFlags.cmake
@@ -54,7 +54,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
message(FATAL_ERROR "Building with a gcc version less than 4.7.3 is not supported.")
endif()
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive- /Zc:char8_t-")
endif()

3
ports/eastl/portfile.cmake
View File

@ -6,9 +6,10 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO electronicarts/EASTL REPO electronicarts/EASTL
REF 3.13.05 REF 3.13.05
SHA512 2364554339203c972f10d58ebe8f14fb221a40451f4cd2c3c5acd6891e8580c1a0a5d4ba592c91349d3feca50d9880648bb37358820a1c9552dde3f7af400a82 SHA512 2364554339203c972f10d58ebe8f14fb221a40451f4cd2c3c5acd6891e8580c1a0a5d4ba592c91349d3feca50d9880648bb37358820a1c9552dde3f7af400a82
HEAD_REF master HEAD_REF master
PATCHES fixchar8_t.patch # can be removed after electronicarts/EASTL#274 is resolved
) )
vcpkg_configure_cmake( vcpkg_configure_cmake(