Skip to content

Commit b10b374

Browse files
togetoge
authored
[eabase] update to 2024-08-18 (for eastl, eathread) (#43553)
1 parent 5755e1e commit b10b374

File tree

5 files changed

+84
-94
lines changed

5 files changed

+84
-94
lines changed

‎ports/eabase/fix_cmake_install.patch‎

Lines changed: 47 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 89c6703..ab8e553 100644
2+
index 652f07f..264aaf5 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -4,6 +4,9 @@
@@ -12,64 +12,50 @@ index 89c6703..ab8e553 100644
1212
#-------------------------------------------------------------------------------------------
1313
# Options
1414
#-------------------------------------------------------------------------------------------
15-
@@ -22,13 +25,51 @@ endif()
16-
add_definitions(-D_CHAR16T)
17-
18-
if (NOT EABASE_BUILD_TESTS)
19-
- #-------------------------------------------------------------------------------------------
20-
- # Header only library
21-
- #-------------------------------------------------------------------------------------------
22-
- add_library(EABase INTERFACE)
15+
@@ -24,14 +27,38 @@ add_definitions(-D_CHAR16T)
16+
#-------------------------------------------------------------------------------------------
17+
# Header only library
18+
#-------------------------------------------------------------------------------------------
19+
-add_library(EABase INTERFACE)
2320
-
24-
- #-------------------------------------------------------------------------------------------
25-
- # Include dirs
26-
- #-------------------------------------------------------------------------------------------
27-
- target_include_directories(EABase INTERFACE include/Common)
28-
+ #-------------------------------------------------------------------------------------------
29-
+ # Header only library
30-
+ #-------------------------------------------------------------------------------------------
31-
+ add_library(EABase INTERFACE)
32-
+ add_library(EABase::EABase ALIAS EABase)
33-
+
34-
+ #-------------------------------------------------------------------------------------------
35-
+ # Include dirs
36-
+ #-------------------------------------------------------------------------------------------
37-
+ target_include_directories(EABase INTERFACE
38-
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/Common>
39-
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
40-
+ )
41-
+
42-
+ # create and install an export set for eabase target as EABase::EABase
43-
+ set(EABase_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EABase")
44-
+
45-
+ configure_package_config_file(
46-
+ EABaseConfig.cmake.in
47-
+ ${CMAKE_CURRENT_BINARY_DIR}/EABaseConfig.cmake
48-
+ INSTALL_DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION}
49-
+ )
50-
+
51-
+ # create and install an export set for Terra target as Terra
52-
+ install(
53-
+ TARGETS EABase EXPORT EABaseTargets
54-
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
55-
+ )
56-
+
57-
+
58-
+ install(EXPORT EABaseTargets DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION})
59-
+
60-
+ write_basic_package_version_file(
61-
+ "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake"
62-
+ VERSION 2.09.12
63-
+ COMPATIBILITY SameMajorVersion
64-
+ )
65-
+
66-
+ install(TARGETS EABase LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
67-
+ install(DIRECTORY "include/Common/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
68-
+
69-
+ install(
70-
+ FILES
71-
+ "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfig.cmake"
72-
+ "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake"
73-
+ DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION}
74-
+ )
75-
endif()
21+
+add_library(EABase INTERFACE)
22+
+add_library(EABase::EABase ALIAS EABase)
23+
#-------------------------------------------------------------------------------------------
24+
# Include dirs
25+
#-------------------------------------------------------------------------------------------
26+
-target_include_directories(EABase INTERFACE include/Common)
27+
-
28+
-#-------------------------------------------------------------------------------------------
29+
-# Installation
30+
-#-------------------------------------------------------------------------------------------
31+
-install(DIRECTORY include/Common/EABase DESTINATION include)
32+
+target_include_directories(EABase INTERFACE
33+
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/Common>
34+
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
35+
+)
36+
+# create and install an export set for eabase target as EABase::EABase
37+
+set(EABase_CMAKE_CONFIG_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/EABase")
38+
+configure_package_config_file(
39+
+ EABaseConfig.cmake.in
40+
+ ${CMAKE_CURRENT_BINARY_DIR}/EABaseConfig.cmake
41+
+ INSTALL_DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION}
42+
+)
43+
+# create and install an export set for Terra target as Terra
44+
+install(
45+
+ TARGETS EABase EXPORT EABaseTargets
46+
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
47+
+)
48+
+install(EXPORT EABaseTargets DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION})
49+
+write_basic_package_version_file(
50+
+ "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake"
51+
+ VERSION 2.09.12
52+
+ COMPATIBILITY SameMajorVersion
53+
+)
54+
+install(TARGETS EABase LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
55+
+install(DIRECTORY "include/Common/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
56+
+install(
57+
+ FILES
58+
+ "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfig.cmake"
59+
+ "${CMAKE_CURRENT_BINARY_DIR}/EABaseConfigVersion.cmake"
60+
+ DESTINATION ${EABase_CMAKE_CONFIG_DESTINATION}
61+
+)

‎ports/eabase/portfile.cmake‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
2-
3-
vcpkg_from_github(
4-
OUT_SOURCE_PATH SOURCE_PATH
5-
REPO electronicarts/EABase
6-
REF d1be0a1d0fc01a9bf8f3f2cea75018df0d2410ee
7-
SHA512 84a11bea06aecbf9a659d92b1ac904b99b2b82023650f4f376b5e68a744f631c5dbdd53d25f746ffb01b428415ac86e4fb8ba758db844acf80560fabe4d77733
8-
HEAD_REF master
9-
PATCHES
10-
fix_cmake_install.patch
11-
)
12-
13-
file(COPY "${CMAKE_CURRENT_LIST_DIR}/EABaseConfig.cmake.in" DESTINATION "${SOURCE_PATH}")
14-
15-
vcpkg_cmake_configure(
16-
SOURCE_PATH "${SOURCE_PATH}"
17-
OPTIONS
18-
-DEABASE_BUILD_TESTS:BOOL=OFF
19-
)
20-
vcpkg_cmake_install()
21-
22-
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EABase)
23-
24-
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
25-
26-
vcpkg_copy_pdbs()
27-
28-
# Handle copyright
29-
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
1+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
2+
3+
vcpkg_from_github(
4+
OUT_SOURCE_PATH SOURCE_PATH
5+
REPO electronicarts/EABase
6+
REF 123363eb82e132c0181ac53e43226d8ee76dea12
7+
SHA512 8df5279d1b303047e832b8b0ddb6cdf51cca753efaeb2a36f7fa5ebc015c2f37cc6a68184b919deb45f09dfd89f9f8f79f18c487817d231f1b049102ceae610f
8+
HEAD_REF master
9+
PATCHES
10+
fix_cmake_install.patch
11+
)
12+
13+
file(COPY "${CMAKE_CURRENT_LIST_DIR}/EABaseConfig.cmake.in" DESTINATION "${SOURCE_PATH}")
14+
15+
vcpkg_cmake_configure(
16+
SOURCE_PATH "${SOURCE_PATH}"
17+
OPTIONS
18+
-DEABASE_BUILD_TESTS:BOOL=OFF
19+
)
20+
vcpkg_cmake_install()
21+
22+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EABase)
23+
24+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
25+
26+
vcpkg_copy_pdbs()
27+
28+
# Handle copyright
29+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

‎ports/eabase/vcpkg.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "eabase",
3-
"version-string": "2.09.12",
4-
"port-version": 3,
3+
"version-date": "2024-08-18",
54
"description": "Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros.",
65
"homepage": "https://github.com/electronicarts/EABase",
76
"dependencies": [

‎versions/baseline.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2457,8 +2457,8 @@
24572457
"port-version": 0
24582458
},
24592459
"eabase": {
2460-
"baseline": "2.09.12",
2461-
"port-version": 3
2460+
"baseline": "2024-08-18",
2461+
"port-version": 0
24622462
},
24632463
"earcut-hpp": {
24642464
"baseline": "2.2.4",

‎versions/e-/eabase.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "414a2b49e81c82eefcd778b01c1dc66ade9ad4fc",
5+
"version-date": "2024-08-18",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "71d9d1d988dad11e4eaa0cb39cc1a957a839308d",
510
"version-string": "2.09.12",

0 commit comments

Comments
 (0)