Skip to content
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

Jump to bottom

[eastl] Fix error C2338 #21538

Merged
merged 4 commits into from
Feb 9, 2022
Merged

[eastl] Fix error C2338 #21538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e33e623
[eastl] Fix error C2338
Nov 19, 2021
1fbb98b
Merge branch 'master' of https://github.com/microsoft/vcpkg into Dev/…
Feb 8, 2022
f57d4ca
update patch
Feb 8, 2022
84ded08
Add license
Feb 8, 2022
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
14 changes: 14 additions & 0 deletions ports/eastl/Fix-error-C2338.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()


1 change: 1 addition & 0 deletions ports/eastl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
3 changes: 2 additions & 1 deletion ports/eastl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
{
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,7 +1950,7 @@
},
"eastl": {
"baseline": "3.18.00",
"port-version": 1
"port-version": 2
},
"easycl": {
"baseline": "0.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/e-/eastl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aa2de2990c3b1e6e008e1cafea8ad82c765278fb",
"version-string": "3.18.00",
"port-version": 2
},
{
"git-tree": "41bc58f85c73fb0dec5374fc0c9b84ffc401555c",
"version-string": "3.18.00",
Expand Down