From b2bc0e4d9cc1215aa556930d2bca142406ee5244 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Fri, 10 Jul 2015 09:42:33 -0600 Subject: misc: Make spirv compile and mv one command Seeing some issues where a parallel make causes problems by moving result of a different compile. Combined the commands into one line to try and reduce odds that happens. --- demos/CMakeLists.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index f3f745f3..d03a0ea0 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -52,24 +52,20 @@ if(WIN32) endif() if(NOT WIN32) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv - COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert - COMMAND mv vert.spv ${CMAKE_BINARY_DIR}/demos/tri-vert.spv + COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert && mv vert.spv ${CMAKE_BINARY_DIR}/demos/tri-vert.spv DEPENDS tri.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator ) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv - COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag - COMMAND mv frag.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv + COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag && mv frag.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv DEPENDS tri.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator ) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv - COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert - COMMAND mv vert.spv ${CMAKE_BINARY_DIR}/demos/cube-vert.spv + COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert && mv vert.spv ${CMAKE_BINARY_DIR}/demos/cube-vert.spv DEPENDS cube.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator ) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv - COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag - COMMAND mv frag.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv + COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag && mv frag.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv DEPENDS cube.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator ) endif() -- cgit v1.2.3