X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=aee9d32bb6260818348eec0a57fe8a43b731b740;hb=02fba9c8e893c6bc5f58ed3708f88cc7166f9702;hp=73a72963c593fd75615d5c871ff99fb48d3f7fc3;hpb=5ec6650c786fab18b98909b417b116c8dee0a64d;p=platform%2Fupstream%2FVK-GL-CTS.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73a7296..aee9d32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,8 +63,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")