Skip to content

[FIX]: Fix libpng ARM source inclusion for non-Darwin AArch64 CMake builds #2302

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

Open
x15sr71 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −5
Open

[FIX]: Fix libpng ARM source inclusion for non-Darwin AArch64 CMake builds #2302

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
13 changes: 8 additions & 5 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,16 @@ include_directories(${PROJECT_SOURCE_DIR}/thirdparty)
include_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash)
include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libpng)

# libpng NEON sources are needed on any arm64/aarch64 target, not just Darwin
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$")
include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libpng/arm)
aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/libpng/arm SOURCEFILE)
endif()

# Check if the operating system is macOS (Darwin)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "arm64")
# ARM Macs
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$")
include_directories("/opt/homebrew/include")
include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libpng/arm)
aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/libpng/arm SOURCEFILE)
else()
include_directories("/usr/local/include")
endif()
Expand Down
Loading