Skip to content

Fix macOS superbuild for Apple Silicon toolchains #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chraibi wants to merge 1 commit into from
Closed

Fix macOS superbuild for Apple Silicon toolchains #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions UnrealFolder/ProjectMobius/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,15 @@ elseif(APPLE)
-DCMAKE_OSX_ARCHITECTURES=arm64
-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0

# Assimp 5.4.3 predates AppleClang's -Wnontrivial-memcall, which its own
# -Werror then turns into a hard failure in SceneCombiner.cpp.
-DASSIMP_WARNINGS_AS_ERRORS=OFF

# Use the bundled contrib/unzip rather than pkg-config's minizip, which on a
# machine with an Intel Homebrew prefix resolves to an x86_64 library and
# fails to link against this arm64 build.
-DASSIMP_BUILD_MINIZIP=ON

# Assimp on UNIX derives ASSIMP_LIB_INSTALL_DIR from CMAKE_INSTALL_LIBDIR.
# Force libs into lib/Mac to match UE_Assimp expectations.
-DCMAKE_INSTALL_LIBDIR=lib/Mac
Expand Down Expand Up @@ -171,13 +180,10 @@ if(WIN32)
COMMENT "Staging Assimp DLLs to ${ASSIMP_STAGE_DIR}"
)
elseif(APPLE)
# Assimp 5.x layouts differ a bit between versions.
# Prefer lib/Mac if it exists (old layout), otherwise fall back to lib/.
if(EXISTS "${ASSIMP_INST}/lib/Mac")
set(ASSIMP_MAC_LIB_DIR "${ASSIMP_INST}/lib/Mac")
else()
set(ASSIMP_MAC_LIB_DIR "${ASSIMP_INST}/lib")
endif()
# CMAKE_INSTALL_LIBDIR is forced to lib/Mac above, so the layout is known.
# An EXISTS check here would run at configure time, before Assimp is installed,
# and on a clean tree would fall back to lib/ and stage a nested Mac/ folder.
set(ASSIMP_MAC_LIB_DIR "${ASSIMP_INST}/lib/Mac")

add_custom_command(TARGET assimp_stage POST_BUILD
COMMAND ${CMAKE_COMMAND} -E rm -rf "${ASSIMP_STAGE_DIR}"
Expand Down
Loading