AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct find_package libpng -> PNG

This commit is contained in:
Luke Street 2020-05-27 21:38:07 -04:00
parent 7d6e73db2c
commit 27a9bd3d59
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/athena vendored

@ -1 +1 @@
Subproject commit 6c52de489f7c2e78fbbd8ea15287f2783c9d5879 Subproject commit dec27c05ed656b37ef75744688529b67c6f60dcc

11
hecl/extern/libpng/CMakeLists.txt vendored
View File

@ -1,8 +1,5 @@
if(NOT WIN32 AND NOT APPLE) find_package(PNG)
find_library(PNG_LIB png) if(NOT PNG_FOUND)
endif()
if(WIN32 OR APPLE OR PNG_LIB STREQUAL PNG_LIB-NOTFOUND)
message(STATUS "Using HECL's built-in libpng") message(STATUS "Using HECL's built-in libpng")
include_directories(${ZLIB_INCLUDE_DIR}) include_directories(${ZLIB_INCLUDE_DIR})
add_library(png add_library(png
@ -31,8 +28,8 @@ add_library(png
pngwutil.c) pngwutil.c)
set(PNG_LIB png CACHE PATH "PNG library" FORCE) set(PNG_LIB png CACHE PATH "PNG library" FORCE)
set(LIBPNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "PNG include path" FORCE) set(PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "PNG include path" FORCE)
else() else()
find_path(LIBPNG_INCLUDE_DIR png.h) find_path(PNG_INCLUDE_DIR png.h)
endif() endif()