Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rastaban merged 3 commits into from
May 9, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9877288
[eastl]Add option(/Zc:char8_t-) to fix compile issue
May 9, 2019
a8e78c4
[eastl]Add option(/Zc:char8_t-) to fix compile issue
May 9, 2019
15a1bf5
[eastl] Add comment with dependancy info
Rastaban May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/eastl/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: eastl
Version: 3.13.05
Version: 3.13.05-1
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.
13 changes: 13 additions & 0 deletions ports/eastl/fixchar8_t.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 1 deletion ports/eastl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO electronicarts/EASTL
REF 3.13.05
REF 3.13.05
SHA512 2364554339203c972f10d58ebe8f14fb221a40451f4cd2c3c5acd6891e8580c1a0a5d4ba592c91349d3feca50d9880648bb37358820a1c9552dde3f7af400a82
HEAD_REF master
PATCHES fixchar8_t.patch # can be removed after electronicarts/EASTL#274 is resolved
)

vcpkg_configure_cmake(
Expand Down