Skip to content

Commit cd0ea2a

Browse files
Jon Creightonctruta
authored andcommitted
Fix for universal binaries on macOS
Fix the issue of a clang: error: no such file or directory: 'x86_64' error on building universal binaries on macOS. It is also necessary to specify: -DCMAKE_C_FLAGS="-DPNG_ARM_NEON_OPT=0" Example CMake command: cmake -S libpng \ -B build_libpng \ -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ -DCMAKE_C_FLAGS="-DPNG_ARM_NEON_OPT=0" Signed-off-by: Cosmin Truta <ctruta@gmail.com>
1 parent 9923515 commit cd0ea2a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CMakeLists.txt
22

3-
# Copyright (c) 2018-2022 Cosmin Truta
3+
# Copyright (c) 2018-2023 Cosmin Truta
44
# Copyright (c) 2007,2009-2018 Glenn Randers-Pehrson
55
# Written by Christian Ehrlicher, 2007
66
# Revised by Roger Lowman, 2009-2010
@@ -20,6 +20,7 @@
2020
# Revised by Gleb Mazovetskiy, 2021
2121
# Revised by Christopher Sean Morrison, 2022
2222
# Revised by Martin Storsjo, 2022
23+
# Revised by Jon Creighton, 2023
2324

2425
# This code is released under the libpng license.
2526
# For conditions of distribution and use, see the disclaimer

scripts/genout.cmake.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ set(ZLIBINCDIR "@ZLIB_INCLUDE_DIRS@")
2424

2525
set(PLATFORM_C_FLAGS)
2626
if(APPLE)
27-
set(CMAKE_OSX_ARCHITECTURES "@CMAKE_OSX_ARCHITECTURES@")
27+
set(CMAKE_OSX_INTERNAL_ARCHITECTURES "@CMAKE_OSX_INTERNAL_ARCHITECTURES@")
2828
set(CMAKE_OSX_SYSROOT "@CMAKE_OSX_SYSROOT@")
29-
if(CMAKE_OSX_ARCHITECTURES)
30-
set(PLATFORM_C_FLAGS ${PLATFORM_C_FLAGS} -arch ${CMAKE_OSX_ARCHITECTURES})
29+
if(CMAKE_OSX_INTERNAL_ARCHITECTURES)
30+
set(PLATFORM_C_FLAGS ${PLATFORM_C_FLAGS} -arch ${CMAKE_OSX_INTERNAL_ARCHITECTURES})
3131
endif()
3232
if(CMAKE_OSX_SYSROOT)
3333
set(PLATFORM_C_FLAGS ${PLATFORM_C_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT})

0 commit comments

Comments
 (0)