Skip to content

Commit

Permalink
[anax] fix osx-arm64 build (#23405)
Browse files Browse the repository at this point in the history
  • Loading branch information
autoantwort committed Mar 7, 2022
1 parent bfc0041 commit b25bcfc
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 11 deletions.
15 changes: 15 additions & 0 deletions ports/anax/osx-arm.patch
Original file line number Diff line number Diff line change
@@ -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}
13 changes: 6 additions & 7 deletions ports/anax/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
Add-bin-output.patch
osx-arm.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
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
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/anax)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/anax/LICENSE ${CURRENT_PACKAGES_DIR}/share/anax/copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

vcpkg_copy_pdbs()
13 changes: 10 additions & 3 deletions ports/anax/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
{
"name": "anax",
"version-string": "2.1.0",
"port-version": 7,
"version": "2.1.0",
"port-version": 8,
"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
}
]
}
5 changes: 5 additions & 0 deletions versions/a-/anax.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "db4b3bfeef52da822588d5bb85a4b3bf9affa80f",
"version": "2.1.0",
"port-version": 8
},
{
"git-tree": "347d15eb157a2bad09742ec97dfc417674936982",
"version-string": "2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
},
"anax": {
"baseline": "2.1.0",
"port-version": 7
"port-version": 8
},
"angelscript": {
"baseline": "2.35.1",
Expand Down

0 comments on commit b25bcfc

Please sign in to comment.