X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=445cf7cc383ad1cfa2c32ad60193b3578b73319c;hb=b1e9663a56e18f0cdffa3280a6c28c77c013cca1;hp=1ecdd52a8cc07634ebe7a7a3f804eb150e5d8386;hpb=8ca5b73a0259721d3ce901b273b6bf2521f43947;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ecdd52..445cf7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,8 +57,14 @@ endif ()
 include_directories(${ZLIB_INCLUDE_PATH})
 
 # libpng
-find_path(PNG_INCLUDE_PATH	png.h)
-find_library(PNG_LIBRARY	png)
+#
+# The FindPNG module defines PNG_INCLUDE_DIRS and PNG_LIBRARIES. But dEQP's
+# CMake files expect the non-standard PNG_INCLUDE_PATH and PNG_LIBRARY. Set the
+# non-standard variables here to retain compatibility with dEQP's existing
+# CMake files.
+include(FindPNG)
+set(PNG_INCLUDE_PATH ${PNG_INCLUDE_DIRS})
+set(PNG_LIBRARY ${PNG_LIBRARIES})
 
 if (NOT PNG_INCLUDE_PATH OR NOT PNG_LIBRARY)
 	message(STATUS "System version of libpng not found, using external/libpng")