From 111c07b6a6ce0642379b631133a81ff0a6835ee5 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Tue, 8 Dec 2015 18:48:43 -0800 Subject: [PATCH] Fix spirv-tools build on Android spirv-tools main CMakeLists.txt now uses option() for SPIRV_SKIP_EXECUTABLES. In order to override the default value from deqp side the value should be set to CACHE. Change-Id: Ie6c5485351ac6b3590f1dc9ab2bcf55b2e6ca1ae --- external/spirv-tools/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/spirv-tools/CMakeLists.txt b/external/spirv-tools/CMakeLists.txt index c595552..c6166ec 100644 --- a/external/spirv-tools/CMakeLists.txt +++ b/external/spirv-tools/CMakeLists.txt @@ -23,7 +23,7 @@ if (EXISTS ${SPIRV_TOOLS_ABS_PATH}/source/opcode.cpp) set(CMAKE_CXX_FLAGS ${DE_3RD_PARTY_CXX_FLAGS}) set(DEQP_HAVE_SPIRV_TOOLS ON PARENT_SCOPE) - set(SPIRV_SKIP_EXECUTABLES ON) + set(SPIRV_SKIP_EXECUTABLES ON CACHE BOOL "" FORCE) add_subdirectory(${SPIRV_TOOLS_ABS_PATH} spirv-tools) else () message(STATUS "spirv-tools not found; SPIR-V assembly not available") -- 2.7.4