Add missing extension requirement

[platform/upstream/VK-GL-CTS.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cff7813..ecb1da9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,10 @@
 # dEQP cmake file
 
 # Module FindGit requires cmake >= 2.8.2
-cmake_minimum_required(VERSION 2.8.2)
+cmake_minimum_required(VERSION 3.0)
 
 find_package(Git)
-find_package(PythonInterp 2)
+find_package(PythonInterp 3)
 
 # dEQP Target.
 set(DEQP_TARGET "default" CACHE STRING "dEQP Target (default, android...)")
@@ -55,8 +55,10 @@ include_directories(
 include(targets/${DEQP_TARGET}/${DEQP_TARGET}.cmake)
 
 # zlib
-find_path(ZLIB_INCLUDE_PATH    zlib.h)
-find_library(ZLIB_LIBRARY      z)
+find_package(ZLIB)
+# dEQP CMake compatibility (as for libpng)
+set(ZLIB_INCLUDE_PATH ${ZLIB_INCLUDE_DIRS})
+set(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
 
 if (NOT ZLIB_INCLUDE_PATH OR NOT ZLIB_LIBRARY)
        message(STATUS "System version of zlib not found, using external/zlib")
@@ -72,7 +74,7 @@ include_directories(${ZLIB_INCLUDE_PATH})
 # 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)
+find_package(PNG)
 set(PNG_INCLUDE_PATH ${PNG_INCLUDE_DIRS})
 set(PNG_LIBRARY ${PNG_LIBRARIES})
 
@@ -88,10 +90,6 @@ add_subdirectory(external/glslang)
 # spirv-tools
 add_subdirectory(external/spirv-tools)
 
-# VkRunner
-add_subdirectory(external/vkrunner)
-include_directories(external/vkrunner/src)
-
 # spirv-headers
 set(SPIRV_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/external/spirv-headers/src/include")
 if (NOT EXISTS ${SPIRV_INCLUDE_PATH})
@@ -99,6 +97,10 @@ if (NOT EXISTS ${SPIRV_INCLUDE_PATH})
 endif()
 include_directories(${SPIRV_INCLUDE_PATH})
 
+# Amber
+add_subdirectory(external/amber)
+include_directories(external/amber)
+
 # RenderDoc API
 include_directories(external/renderdoc/src)
 
@@ -201,6 +203,7 @@ include_directories(
        framework/randomshaders
        framework/egl
        framework/egl/wrapper
+       framework/xexml
        external/vulkancts/framework/vulkan
        )