Check libpng directly into third_party/

cmake/CMakeLists.txt

 # Boilerplate.
 cmake_minimum_required (VERSION 3.1)   # First version with CMAKE_CXX_STANDARD.
 project (skimake)
 set (CMAKE_CXX_STANDARD 11)
 
 # Default to Release mode.  We're mainly targeting Skia users, not Skia developers.
 if (NOT CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE Release)
 endif ()
 
@@ skipping 17 matching lines @@
 list (REMOVE_ITEM public_includes ${private_includes})  # Easiest way to exclude private.
 file (GLOB default_include_config "../include/config")
 list (REMOVE_ITEM public_includes ${default_include_config})
 set (userconfig_directory ${CMAKE_BINARY_DIR}/include)
 list (APPEND public_includes ${userconfig_directory})
 
 # These guys are third_party but provided by a Skia checkout.
 list (APPEND srcs             ../third_party/etc1/etc1.cpp ../third_party/ktx/ktx.cpp)
 list (APPEND private_includes ../third_party/etc1          ../third_party/ktx)
 
+list (APPEND private_includes ../third_party/libpng)
+file (GLOB libpng_srcs ../third_party/libpng/*.c)
+foreach (src ${libpng_srcs})
+    list (APPEND srcs ${src})
+endforeach()
+
+
 function (remove_srcs)
     file (GLOB_RECURSE to_remove ${ARGN})
     list (REMOVE_ITEM srcs ${to_remove})
     set (srcs ${srcs} PARENT_SCOPE)
 endfunction()
 
 # This file is empty and is only used to trick GYP.
 remove_srcs (../src/core/SkForceCPlusPlusLinking.cpp)
 # Chrome only?
 remove_srcs (../src/ports/SkFontHost_fontconfig.cpp
@@ skipping 93 matching lines @@
 find_path (OSMESA_INCLUDE_DIRS "GL/osmesa.h")
 find_library(OSMESA_LIBRARIES "OSMesa")
 
 if (UNIX AND NOT APPLE)
     find_package (Freetype)
     # Same deal for fontconfig.
     find_path (FONTCONFIG_INCLUDE_DIRS "fontconfig/fontconfig.h")
     find_library (FONTCONFIG_LIBRARIES fontconfig)
     find_package (GIF)
     find_package (JPEG)
-    find_package (PNG)
 endif()
 
 # Do not compile SkRawCodec.
 remove_srcs(../src/codec/*Raw*.cpp)
 
 # TODO: macro away this if (found) ... else() ... endif() stuff.
 
 if (EXPAT_FOUND)
     list (APPEND private_includes ${EXPAT_INCLUDE_DIRS})
     list (APPEND libs             ${EXPAT_LIBRARIES})
@@ skipping 19 matching lines @@
     remove_srcs(../src/codec/*Jpeg*)
 endif()
 
 if (LUA_FOUND)
     list (APPEND private_includes ${LUA_INCLUDE_DIR})
     list (APPEND libs             ${LUA_LIBRARIES})
 else()
     remove_srcs(../src/utils/*Lua*)
 endif()
 
-if (PNG_FOUND)
-    list (APPEND private_includes ${PNG_INCLUDE_DIRS})
-    list (APPEND libs             ${PNG_LIBRARIES})
-    add_definitions(-DPNG_SKIP_SETJMP_CHECK)
-    add_definitions(-DPNG_SKIP_SKIA_OPTS)
-    add_definitions(-DSK_HAS_PNG_LIBRARY)
-else()
-    remove_srcs(../src/images/*PNG*)
-    remove_srcs(../src/codec/*Png*)
-    remove_srcs(../src/codec/*Ico*)
-endif()
+# PNG
+add_definitions(-DSK_HAS_PNG_LIBRARY)
+add_definitions(-DPNG_ARM_NEON_OPT=0)
 
 if (ZLIB_FOUND)
     list (APPEND private_includes ${ZLIB_INCLUDE_DIRS})
     list (APPEND libs             ${ZLIB_LIBRARIES})
     remove_srcs(../src/pdf/SkDocument_PDF_None.cpp)
 else()
     remove_srcs(../src/pdf/*.cpp)
     set (srcs ${srcs} ../src/pdf/SkDocument_PDF_None.cpp)
 endif()
 
@@ skipping 136 matching lines @@
         file (APPEND ${skia_h_path} "#include \"${filename_component}\"\n")
       endif ()
     endforeach()
   endif()
 endforeach()
 file(APPEND ${skia_h_path} "\n#endif  // skia_DEFINED\n")
 
 # Now build a simple example app that uses Skia via libskia.so.
 add_executable(example example.cpp)
 target_link_libraries(example skia ${OPENGL_LIBRARIES})