X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=CMakeLists.txt;h=4f2513851ad8aeefc1c46692abf6c100ec2a0b0e;hb=d297d9af7e55da0b0377bec4b9c1eb9d7209a40b;hp=3caa6d4fe100829aff7cdf90d6b4b7857bf92953;hpb=83726b75ccea0d486a0d4173ef9052cf9413ec72;p=platform%2Fupstream%2FVK-GL-CTS.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 3caa6d4..4f25138 100644 --- 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...)") @@ -95,6 +95,13 @@ 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) + include_directories(${PNG_INCLUDE_PATH}) message(STATUS "DEQP_TARGET_NAME = ${DEQP_TARGET_NAME}") @@ -155,6 +162,18 @@ if (DE_COMPILER_IS_MSC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_SCL_SECURE_NO_WARNINGS") endif () +# Precompiled header macro. Parameters are source file list and filename for pch cpp file. +macro(PCH SRCS PCHCPP) + if(MSVC AND CMAKE_GENERATOR MATCHES "^Visual Studio") + set(PCH_NAME "$(IntDir)\\pch.pch") + # make source files use/depend on PCH_NAME + set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS "/Yupch.h /FIpch.h /Fp${PCH_NAME}" OBJECT_DEPENDS "${PCH_NAME}") + # make PCHCPP file compile and generate PCH_NAME + set_source_files_properties(${PCHCPP} PROPERTIES COMPILE_FLAGS "/Ycpch.h /Fp${PCH_NAME}" OBJECT_OUTPUTS "${PCH_NAME}") + list(APPEND ${SRCS} "${PCHCPP}") + endif() +endmacro(PCH) + # delibs projects add_subdirectory(framework/delibs/debase) add_subdirectory(framework/delibs/depool)