diff options
| author | GregF <greg@LunarG.com> | 2015-07-14 11:35:45 -0600 |
|---|---|---|
| committer | GregF <greg@LunarG.com> | 2015-07-14 11:44:49 -0600 |
| commit | 6fe749b8d2d5d6470089092f9b1f199c5ce01eb1 (patch) | |
| tree | b6ca6b8b3bcd32231c0f33fd0f4cc6754ec54fdd | |
| parent | daa4037b973f086ab96f0967ef24f788e99c1c87 (diff) | |
| download | usermoji-6fe749b8d2d5d6470089092f9b1f199c5ce01eb1.tar.xz | |
demos: use -o on glslangValidator to allow parallel make
| -rw-r--r-- | LunarGLASS_revision | 2 | ||||
| -rw-r--r-- | demos/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | glslang_revision | 2 |
3 files changed, 6 insertions, 30 deletions
diff --git a/LunarGLASS_revision b/LunarGLASS_revision index 113c4d24..fc15416f 100644 --- a/LunarGLASS_revision +++ b/LunarGLASS_revision @@ -1 +1 @@ -1093 +1095 diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index 6b48fcdd..1eea0d7b 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -52,44 +52,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 565eaa46..0ba895a8 100644 --- a/glslang_revision +++ b/glslang_revision @@ -1 +1 @@ -e6f7988adec197e0590fb8274b0412811456d3e6 +3a194f7ba46b747411181736203f9389a5406d81 |