From ce45dd94d53cd489140cd79b5d51d58604656391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabien=20P=C3=A9an?= Date: Tue, 31 Aug 2021 03:21:30 +0200 Subject: [eastl] fix dependency eabase (#19643) --- ports/eabase/CONTROL | 4 ---- ports/eabase/fix_cmake_install.patch | 4 ++-- ports/eabase/vcpkg.json | 7 +++++++ ports/eastl/CONTROL | 5 ----- ports/eastl/EASTLConfig.cmake.in | 3 +++ ports/eastl/vcpkg.json | 10 ++++++++++ 6 files changed, 22 insertions(+), 11 deletions(-) delete mode 100644 ports/eabase/CONTROL create mode 100644 ports/eabase/vcpkg.json delete mode 100644 ports/eastl/CONTROL create mode 100644 ports/eastl/vcpkg.json (limited to 'ports') diff --git a/ports/eabase/CONTROL b/ports/eabase/CONTROL deleted file mode 100644 index 2855f5f2f..000000000 --- a/ports/eabase/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: eabase -Version: 2.09.12-1 -Homepage: https://github.com/electronicarts/EABase -Description: Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros. diff --git a/ports/eabase/fix_cmake_install.patch b/ports/eabase/fix_cmake_install.patch index 1a81fd69f..ea83e66b2 100644 --- a/ports/eabase/fix_cmake_install.patch +++ b/ports/eabase/fix_cmake_install.patch @@ -36,7 +36,7 @@ index 89c6703..ab8e553 100644 + #------------------------------------------------------------------------------------------- + target_include_directories(EABase INTERFACE + $ -+ $ ++ $ + ) + + # create and install an export set for eabase target as EABase::EABase @@ -64,7 +64,7 @@ index 89c6703..ab8e553 100644 + ) + + install(TARGETS EABase LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+ install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") ++ install(DIRECTORY "include/Common/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + + install( + FILES diff --git a/ports/eabase/vcpkg.json b/ports/eabase/vcpkg.json new file mode 100644 index 000000000..d9032602c --- /dev/null +++ b/ports/eabase/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "eabase", + "version-string": "2.09.12", + "port-version": 2, + "description": "Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros.", + "homepage": "https://github.com/electronicarts/EABase" +} diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL deleted file mode 100644 index da3a4b734..000000000 --- a/ports/eastl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: eastl -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 diff --git a/ports/eastl/EASTLConfig.cmake.in b/ports/eastl/EASTLConfig.cmake.in index 6e1a8ea90..92fb2b18d 100644 --- a/ports/eastl/EASTLConfig.cmake.in +++ b/ports/eastl/EASTLConfig.cmake.in @@ -1,5 +1,8 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) +find_dependency(EABase CONFIG REQUIRED) + # Provide path for scripts list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") diff --git a/ports/eastl/vcpkg.json b/ports/eastl/vcpkg.json new file mode 100644 index 000000000..9fd13a0c8 --- /dev/null +++ b/ports/eastl/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "eastl", + "version-string": "3.17.03", + "port-version": 1, + "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", + "dependencies": [ + "eabase" + ] +} -- cgit v1.2.3