cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-pnglibconf-on-osx' of git://github.com/aseprite/libpng into libpng16

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2016-05-01 19:04:25 -05:00
commit f962ee9dc6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/genout.cmake.in
View File

@ -22,6 +22,13 @@ set(PNGLIB_MINOR "@PNGLIB_MINOR@")
set(PNGLIB_VERSION "@PNGLIB_VERSION@") set(PNGLIB_VERSION "@PNGLIB_VERSION@")
set(ZLIBINCDIR "@ZLIB_INCLUDE_DIR@") set(ZLIBINCDIR "@ZLIB_INCLUDE_DIR@")
set(PLATFORM_C_FLAGS)
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "@CMAKE_OSX_ARCHITECTURES@")
set(CMAKE_OSX_SYSROOT "@CMAKE_OSX_SYSROOT@")
set(PLATFORM_C_FLAGS -arch ${CMAKE_OSX_ARCHITECTURES} -isysroot ${CMAKE_OSX_SYSROOT})
endif()
get_filename_component(INPUTEXT "${INPUT}" EXT) get_filename_component(INPUTEXT "${INPUT}" EXT)
get_filename_component(OUTPUTEXT "${OUTPUT}" EXT) get_filename_component(OUTPUTEXT "${OUTPUT}" EXT)
get_filename_component(INPUTBASE "${INPUT}" NAME_WE) get_filename_component(INPUTBASE "${INPUT}" NAME_WE)
@ -48,6 +55,7 @@ if ("${INPUTEXT}" STREQUAL ".c" AND "${OUTPUTEXT}" STREQUAL ".out")
execute_process(COMMAND "${CMAKE_C_COMPILER}" "-E" execute_process(COMMAND "${CMAKE_C_COMPILER}" "-E"
${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS}
${PLATFORM_C_FLAGS}
"-I${SRCDIR}" "-I${SRCDIR}"
"-I${BINDIR}" "-I${BINDIR}"
${INCLUDES} ${INCLUDES}