Diff of /CMakeModules/FindPNG.cmake [9e26cc] .. [832b36] Maximize Restore

  Switch to side-by-side view

--- a/CMakeModules/FindPNG.cmake
+++ b/CMakeModules/FindPNG.cmake
@@ -24,6 +24,7 @@
   FIND_PATH(PNG_INCLUDE_DIR png.h
     /usr/local/include
     /usr/include
+    ${SOURCE_BASE_DIR}/libpng/include
     ${SOURCE_BASE_DIR}/lpng142
     ${SOURCE_BASE_DIR}/lpng141
     ${SOURCE_BASE_DIR}/lpng140
@@ -32,8 +33,8 @@
 
   find_library_with_debug(PNG_LIBRARIES
     WIN32_DEBUG_POSTFIX d
-    NAMES png libpng libpng14 wxpng
-    PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib ${wxWidgets_LIB_DIR}
+    NAMES png libpng libpng14 libpng15 wxpng
+    PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/libpng/lib ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib ${wxWidgets_LIB_DIR}
   )
 
   include(FindPackageHandleStandardArgs)