From d9eb98ee64424625eaf9096426a517636d6a1545 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 26 Nov 2018 18:12:11 +0000 Subject: [PATCH] Remove SPIRV-Tools timers hack, cmake option is now upstream --- util/spirv-plugins/_build.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/util/spirv-plugins/_build.sh b/util/spirv-plugins/_build.sh index b989e4d7f..e978b469a 100644 --- a/util/spirv-plugins/_build.sh +++ b/util/spirv-plugins/_build.sh @@ -49,11 +49,8 @@ pushd glslang # Now build mkdir build pushd build - - # Hack for now until there's a cmake option to turn this off. - export CXXFLAGS="-USPIRV_TIMER_ENABLED" - cmake .. -DSPIRV_SKIP_TESTS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${OUT}" + cmake .. -DSPIRV_ALLOW_TIMERS=OFF -DSPIRV_SKIP_TESTS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${OUT}" if [ "${PLATFORM:0:3}" == "win" ]; then cmake --build . --config Release --target install