[foonathan-memory]: update to 0.7-3 (#31905)

* Bump foonathan-memory version.

* Remove port-version.

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>

* Changed REF to version tag.

* Updates git-tree.

* Removes commented lines.

* Update ports/foonathan-memory/vcpkg.json

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>

* [foonathan_memory]: update to 0.7-3

* fix deps

* fix deps

* fix deps

* fix deps

* fix deps

* CI

---------

Co-authored-by: Correia, Marco <correiam@ryanair.com>
Co-authored-by: Marco Correia <marco.v.correia@gmail.com>
Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
This commit is contained in:
Jia Yue Hua 2023-06-13 07:46:11 +08:00 committed by GitHub
parent 1f627e6a74
commit d0745d16a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 27 deletions

View File

@ -0,0 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddbc459..06c4165 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ set(CMAKE_DEBUG_POSTFIX "-dbg")
if(UNIX OR VXWORKS)
include(GNUInstallDirs)
- set(FOONATHAN_MEMORY_INC_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/foonathan_memory")
+ set(FOONATHAN_MEMORY_INC_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
set(FOONATHAN_MEMORY_RUNTIME_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
set(FOONATHAN_MEMORY_LIBRARY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
set(FOONATHAN_MEMORY_ARCHIVE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
@@ -29,7 +29,7 @@ if(UNIX OR VXWORKS)
set(FOONATHAN_MEMORY_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/foonathan_memory/cmake")
set(FOONATHAN_MEMORY_ADDITIONAL_FILES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/foonathan_memory")
elseif(WIN32)
- set(FOONATHAN_MEMORY_INC_INSTALL_DIR "include/foonathan_memory")
+ set(FOONATHAN_MEMORY_INC_INSTALL_DIR "include/")
set(FOONATHAN_MEMORY_RUNTIME_INSTALL_DIR "bin")
set(FOONATHAN_MEMORY_LIBRARY_INSTALL_DIR "bin")
set(FOONATHAN_MEMORY_ARCHIVE_INSTALL_DIR "lib")

View File

@ -5,9 +5,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO foonathan/memory
REF 885a9d97bebe9a2f131d21d3c0928c42ab377c8b
SHA512 7ce78a6e67d590a41b7f8a3d4ae0f6c1fa157c561b718a63973dffc000df74a9f0a0d7955a099e84fbeb3cf4085092eb866a6b8cec8bafd50bdcee94d069f65d
REF "v0.7-3"
SHA512 302a046e204d1cd396a4a36b559d3360d17801d99f0f22b58314ff66706ae86ce4f364731004c1c293e01567a9510229cda7fc4978e0e47740176026d47e8403
HEAD_REF master
PATCHES
fix-foonathan-memory-include-install-dir.patch
)
vcpkg_from_github(
@ -34,8 +36,8 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME foonathan_memory)
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/foonathan_memory/cmake")
vcpkg_cmake_config_fixup(CONFIG_PATH lib/foonathan_memory/cmake PACKAGE_NAME foonathan_memory)
elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/foonathan_memory/cmake")
vcpkg_cmake_config_fixup(CONFIG_PATH share/foonathan_memory/cmake PACKAGE_NAME foonathan_memory)
endif()
@ -44,29 +46,13 @@ vcpkg_copy_pdbs()
# Place header files into the right folders
# The original layout is not a problem for CMake-based project.
file(COPY
"${CURRENT_PACKAGES_DIR}/include/foonathan_memory/foonathan"
DESTINATION "${CURRENT_PACKAGES_DIR}/include"
)
file(GLOB
COMP_INCLUDE_FILES
"${CURRENT_PACKAGES_DIR}/include/foonathan_memory/comp/foonathan/*.hpp"
)
file(COPY
${COMP_INCLUDE_FILES}
DESTINATION "${CURRENT_PACKAGES_DIR}/include/foonathan"
)
file(COPY
"${CURRENT_PACKAGES_DIR}/include/foonathan_memory/config_impl.hpp"
DESTINATION "${CURRENT_PACKAGES_DIR}/include/foonathan/memory"
)
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/include/foonathan_memory"
)
vcpkg_replace_string(
"${CURRENT_PACKAGES_DIR}/share/foonathan_memory/foonathan_memory-config.cmake"
"\${_IMPORT_PREFIX}/include/foonathan_memory/comp;\${_IMPORT_PREFIX}/include/foonathan_memory"
"\${_IMPORT_PREFIX}/include"
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/lib/foonathan_memory"
"${CURRENT_PACKAGES_DIR}/debug/lib/foonathan_memory"
)
# Place header files into the right folders - Done!

View File

@ -1,9 +1,9 @@
{
"name": "foonathan-memory",
"version-date": "2019-07-21",
"port-version": 4,
"version": "0.7.3",
"description": "STL compatible C++ memory allocator library",
"homepage": "https://foonathan.net/doc/memory/",
"license": "Zlib",
"dependencies": [
{
"name": "vcpkg-cmake",

View File

@ -2585,8 +2585,8 @@
"port-version": 0
},
"foonathan-memory": {
"baseline": "2019-07-21",
"port-version": 4
"baseline": "0.7.3",
"port-version": 0
},
"forest": {
"baseline": "12.1.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e5d8f014667fd2e794d0e4dab67adc193731b246",
"version": "0.7.3",
"port-version": 0
},
{
"git-tree": "815422e5bf77feefa4e1c277832d307b6bb47438",
"version-date": "2019-07-21",