diff options
| author | GregF <greg@LunarG.com> | 2015-07-14 11:35:45 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-07-31 14:15:23 -0600 |
| commit | ea12567ed28031e1ed1a2240df145a63dc3b2354 (patch) | |
| tree | dee032efe1ae9b5d8fbf6abb4d865ff525d833a1 | |
| parent | 31f4806d293eb8538e47f9ab790484be15505a61 (diff) | |
| download | usermoji-ea12567ed28031e1ed1a2240df145a63dc3b2354.tar.xz | |
demos: use -o on glslangValidator to allow parallel make
| -rw-r--r-- | demos/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | glslang_revision | 1 |
2 files changed, 4 insertions, 29 deletions
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index f6ef2863..427b1942 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -49,44 +49,20 @@ if(WIN32) endif() if(NOT WIN32) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv - COMMAND rm -rf tri-vert-dir - COMMAND mkdir tri-vert-dir - COMMAND cd tri-vert-dir - 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 cd .. - COMMAND rm -rf tri-vert-dir + COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o tri-vert.spv ${PROJECT_SOURCE_DIR}/demos/tri.vert DEPENDS tri.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator ) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv - COMMAND rm -rf tri-frag-dir - COMMAND mkdir tri-frag-dir - COMMAND cd tri-frag-dir - 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 cd .. - COMMAND rm -rf tri-frag-dir + COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o tri-frag.spv ${PROJECT_SOURCE_DIR}/demos/tri.frag DEPENDS tri.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator ) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv - COMMAND rm -rf cube-vert-dir - COMMAND mkdir cube-vert-dir - COMMAND cd cube-vert-dir - 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 cd .. - COMMAND rm -rf cube-vert-dir + COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert DEPENDS cube.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator ) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv - COMMAND rm -rf cube-frag-dir - COMMAND mkdir cube-frag-dir - COMMAND cd cube-frag-dir - 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 cd .. - COMMAND rm -rf cube-frag-dir + COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag DEPENDS cube.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator ) endif() diff --git a/glslang_revision b/glslang_revision index 1b390d54..80c19e9d 100644 --- a/glslang_revision +++ b/glslang_revision @@ -1,2 +1 @@ 917ec4ac8c5423315d8a3f99d1392246c4603d57 - |