[anax] fix osx-arm64 build (#23405)

This commit is contained in:
autoantwort 2022-03-07 20:09:47 +01:00 committed by GitHub
parent bfc00415da
commit b25bcfcc2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 11 deletions

15
ports/anax/osx-arm.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d427767..80965bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,10 +154,6 @@ set_target_properties(${ANAX_LIBRARY_NAME} PROPERTIES
SOVERSION ${ANAX_VERSION_MAJOR}
)
-if(APPLE)
- set_target_properties(${ANAX_LIBRARY_NAME} PROPERTIES OSX_ARCHITECTURES "i386;x86_64;")
-endif()
-
# Library files
install(
TARGETS ${ANAX_LIBRARY_NAME}

View File

@ -8,20 +8,19 @@ vcpkg_from_github(
HEAD_REF master HEAD_REF master
PATCHES PATCHES
Add-bin-output.patch Add-bin-output.patch
osx-arm.patch
) )
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE DISABLE_PARALLEL_CONFIGURE
) )
vcpkg_install_cmake() vcpkg_cmake_install()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# Handle copyright # Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/anax) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/anax/LICENSE ${CURRENT_PACKAGES_DIR}/share/anax/copyright)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()

View File

@ -1,7 +1,14 @@
{ {
"name": "anax", "name": "anax",
"version-string": "2.1.0", "version": "2.1.0",
"port-version": 7, "port-version": 8,
"description": "An open source C++ entity system.", "description": "An open source C++ entity system.",
"homepage": "https://github.com/miguelmartin75/anax" "homepage": "https://github.com/miguelmartin75/anax",
"license": "MIT",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
} }

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "db4b3bfeef52da822588d5bb85a4b3bf9affa80f",
"version": "2.1.0",
"port-version": 8
},
{ {
"git-tree": "347d15eb157a2bad09742ec97dfc417674936982", "git-tree": "347d15eb157a2bad09742ec97dfc417674936982",
"version-string": "2.1.0", "version-string": "2.1.0",

View File

@ -78,7 +78,7 @@
}, },
"anax": { "anax": {
"baseline": "2.1.0", "baseline": "2.1.0",
"port-version": 7 "port-version": 8
}, },
"angelscript": { "angelscript": {
"baseline": "2.35.1", "baseline": "2.35.1",