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

[EASTL] update to 3.17.03 #14980

Merged
merged 1 commit into from
Dec 7, 2020
Merged

[EASTL] update to 3.17.03 #14980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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,5 +1,5 @@
Source: eastl
Version: 3.16.07
Version: 3.17.03
Homepage: https://github.com/electronicarts/EASTL
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.
Build-Depends: eabase
12 changes: 8 additions & 4 deletions ports/eastl/fix_cmake_install.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8171cd..44120cc 100644
index e8700dc..6d3e2f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,12 +4,17 @@
Expand All @@ -20,7 +20,7 @@ index b8171cd..44120cc 100644
#-------------------------------------------------------------------------------------------
# Compiler Flags
#-------------------------------------------------------------------------------------------
@@ -41,10 +46,46 @@ add_definitions(-DEASTL_OPENSOURCE=1)
@@ -41,7 +46,10 @@ add_definitions(-DEASTL_OPENSOURCE=1)
#-------------------------------------------------------------------------------------------
# Include dirs
#-------------------------------------------------------------------------------------------
Expand All @@ -32,7 +32,10 @@ index b8171cd..44120cc 100644

#-------------------------------------------------------------------------------------------
# Dependencies
#-------------------------------------------------------------------------------------------
@@ -50,5 +58,39 @@ if (NOT TARGET EABase)
add_subdirectory(test/packages/EABase)
endif()

-target_link_libraries(EASTL EABase)
+target_link_libraries(EASTL PUBLIC EABase)
+
Expand Down Expand Up @@ -62,10 +65,11 @@ index b8171cd..44120cc 100644
+
+install(TARGETS EASTL LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

+
+install(
+ FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/EASTLConfigVersion.cmake"
+ DESTINATION ${EASTL_CMAKE_CONFIG_DESTINATION}
+)

4 changes: 2 additions & 2 deletions ports/eastl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO electronicarts/EASTL
REF 1cf6182218bec79ece0b91e762f507e8c027807c # 3.16.07
SHA512 a0d140a6ff202eb9360a7cbb4ae59881458b628a7bc5ffb19864aba585fd0b02c7f7a2692df2e1c52aa58bc3c3471f27b365fa7770b7d84c038d24884db10b9b
REF 41bd2e4466e33b979d2afc37f9b98dacf1eab50b #v 3.17.03
SHA512 3011a0a08701b683e22cc624167b4f65fce8b16d0f7a03675f6a1d5b02313c5b763bcc6c8091f65728ed60ceee8d585cbdb1968a35fb24954f4f66afabb23865
HEAD_REF master
PATCHES
fix_cmake_install.patch
Expand Down