[eastl] Fix error C2338 (#21538)

* [eastl] Fix error C2338

* update patch

* Add license

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
This commit is contained in:
Cheney Wang 2022-02-09 13:29:09 +08:00 committed by GitHub
parent e2c7976c10
commit dd4c769a89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 2 deletions

View File

@ -0,0 +1,14 @@
diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake
index 08b6af5..281665e 100644
--- a/scripts/CMake/CommonCppFlags.cmake
+++ b/scripts/CMake/CommonCppFlags.cmake
@@ -74,6 +74,9 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
endif()
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.31.30911.95")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:static_assert-")
+ endif()
endif()

View File

@ -8,6 +8,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix_cmake_install.patch
Fix-error-C2338.patch
)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/EASTLConfig.cmake.in" DESTINATION "${SOURCE_PATH}")

View File

@ -1,9 +1,10 @@
{
"name": "eastl",
"version-string": "3.18.00",
"port-version": 1,
"port-version": 2,
"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.",
"homepage": "https://github.com/electronicarts/EASTL",
"license": "BSD-3-Clause",
"dependencies": [
"eabase",
{

View File

@ -1950,7 +1950,7 @@
},
"eastl": {
"baseline": "3.18.00",
"port-version": 1
"port-version": 2
},
"easycl": {
"baseline": "0.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aa2de2990c3b1e6e008e1cafea8ad82c765278fb",
"version-string": "3.18.00",
"port-version": 2
},
{
"git-tree": "41bc58f85c73fb0dec5374fc0c9b84ffc401555c",
"version-string": "3.18.00",