-diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/CMakeLists.txt
---- vulkan-sdk-1.0.5.0.orig/VulkanTools/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
-+++ vulkan-sdk-1.0.5.0/VulkanTools/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
-@@ -90,7 +90,7 @@
-
- if (BUILD_ICD OR BUILD_TESTS)
- # Hard code our glslang path for now
-- get_filename_component(GLSLANG_PREFIX ../glslang ABSOLUTE)
-+ set(GLSLANG_PREFIX /usr/include/glslang)
-
- if(NOT EXISTS ${GLSLANG_PREFIX})
- message(FATAL_ERROR "Necessary glslang components do not exist: " ${GLSLANG_PREFIX})
-diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/demos/CMakeLists.txt
---- vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
-+++ vulkan-sdk-1.0.5.0/VulkanTools/demos/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
-@@ -28,45 +28,45 @@
- endif()
-
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
-- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
-+ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
- COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
-- DEPENDS tri.vert ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+ DEPENDS tri.vert
- )
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
-- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag
-+ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag
- COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
-- DEPENDS tri.frag ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+ DEPENDS tri.frag
- )
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
-- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
-+ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
- COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
-- DEPENDS cube.vert ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+ DEPENDS cube.vert
- )
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
-- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag
-+ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag
- COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
-- DEPENDS cube.frag ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
-+ DEPENDS cube.frag
- )
- file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
- file(COPY tri.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
- file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
- else()
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
-- 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
-+ COMMAND glslangValidator -s -V -o tri-vert.spv ${PROJECT_SOURCE_DIR}/demos/tri.vert
-+ DEPENDS tri.vert
- )
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
-- 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
-+ COMMAND glslangValidator -s -V -o tri-frag.spv ${PROJECT_SOURCE_DIR}/demos/tri.frag
-+ DEPENDS tri.frag
- )
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
-- 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
-+ COMMAND glslangValidator -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert
-+ DEPENDS cube.vert
- )
-
- add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
-- 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
-+ COMMAND glslangValidator -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag
-+ DEPENDS cube.frag
- )
- endif()
-
-diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/CMakeLists.txt
---- vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
-+++ vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
-@@ -1,4 +1,4 @@
--set(GLSLANG_VALIDATOR ${GLSLANG_PREFIX}/build/install/bin/glslangValidator)
-+set(GLSLANG_VALIDATOR glslangValidator)
- set (GLMINC_PREFIX ${PROJECT_SOURCE_DIR}/libs)
-
- macro(generate_dispatch_table out)
-@@ -11,7 +11,7 @@
- macro(glsl_to_spirv src)
- add_custom_command(OUTPUT ${src}.h
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${src}.h ${GLSLANG_VALIDATOR}
-- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${GLSLANG_VALIDATOR}
-+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src}
- )
- endmacro()
-
-diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/glsl-to-spirv vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/glsl-to-spirv
---- vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/glsl-to-spirv 2016-03-12 00:47:34.000000000 +0100
-+++ vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/glsl-to-spirv 2016-03-12 20:42:39.011470974 +0100
-@@ -38,7 +38,7 @@
- in_filename = sys.argv[1]
- out_filename = sys.argv[2] if len(sys.argv) > 2 else None
- validator = sys.argv[3] if len(sys.argv) > 3 else \
-- "../../../glslang/build/install/bin/glslangValidator"
-+ "glslangValidator"
-
- def identifierize(s):
- # translate invalid chars
-diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/icd/intel/compiler/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/icd/intel/compiler/CMakeLists.txt
---- vulkan-sdk-1.0.5.0.orig/VulkanTools/icd/intel/compiler/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
-+++ vulkan-sdk-1.0.5.0/VulkanTools/icd/intel/compiler/CMakeLists.txt 2016-03-12 20:42:44.144824665 +0100
-@@ -38,15 +38,6 @@
- message(FATAL_ERROR "llvm-config failed: " ${LLVM_LIBS_RESULT})
- endif()
-
--# Expect libraries to be in either the build (release build) or dbuild (debug) directories
--if(EXISTS ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/lib)
-- set(GLSLANG_BUILD ${GLSLANG_PREFIX}/${BUILDTGT_DIR})
--elseif(EXISTS ${GLSLANG_PREFIX}/dbuild/install/lib)
-- set(GLSLANG_BUILD ${GLSLANG_PREFIX}/dbuild)
--else()
-- message(FATAL_ERROR "Necessary glslang libraries cannot be found: " ${GLSLANG_PREFIX})
--endif()
--
- if(EXISTS ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/install/lib)
- set(LUNARGLASS_BUILD ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR})
- elseif(EXISTS ${LUNARGLASS_PREFIX}/dbuild/install/lib)
-@@ -75,7 +66,6 @@
- COMPILE_FLAGS "${LLVM_CXX_CONFIG}")
-
- SET(COMPILER_LINK_DIRS
-- -L${GLSLANG_BUILD}/install/lib
- -L${LUNARGLASS_PREFIX}/Core/LLVM/llvm-3.4/${BUILDTGT_DIR}/install/usr/local/lib
- -L${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Core
- -L${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Frontends/glslang
-@@ -121,9 +111,9 @@
- set_target_properties(SpvFrontend PROPERTIES IMPORTED_LOCATION ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Frontends/SPIRV/libSpvFrontend.a)
- set_target_properties(core PROPERTIES IMPORTED_LOCATION ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Core/libcore.a)
- set_target_properties(LLVMipo PROPERTIES IMPORTED_LOCATION ${LUNARGLASS_PREFIX}/Core/LLVM/llvm-3.4/${BUILDTGT_DIR}/install/usr/local/lib/libLLVMipo.a)
--set_target_properties(glslang PROPERTIES IMPORTED_LOCATION ${GLSLANG_BUILD}/install/lib/libglslang.a)
--set_target_properties(SPIRV PROPERTIES IMPORTED_LOCATION ${GLSLANG_BUILD}/install/lib/libSPIRV.a)
--set_target_properties(OGLCompiler PROPERTIES IMPORTED_LOCATION ${GLSLANG_BUILD}/install/lib/libOGLCompiler.a)
-+set_target_properties(glslang PROPERTIES IMPORTED_LOCATION ${CMAKE_INSTALL_LIBDIR}/libglslang.a)
-+set_target_properties(SPIRV PROPERTIES IMPORTED_LOCATION ${CMAKE_INSTALL_LIBDIR}/libSPIRV.a)
-+set_target_properties(OGLCompiler PROPERTIES IMPORTED_LOCATION ${CMAKE_INSTALL_LIBDIR}/libOGLCompiler.a)
-
- SET(COMPILER_INCLUDE_DIRS
- ${GLSLANG_PREFIX}
-diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/layers/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/layers/CMakeLists.txt
---- vulkan-sdk-1.0.5.0.orig/VulkanTools/layers/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
-+++ vulkan-sdk-1.0.5.0/VulkanTools/layers/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
-@@ -99,7 +99,7 @@
- ${CMAKE_CURRENT_SOURCE_DIR}/../loader
- ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan
- ${CMAKE_CURRENT_BINARY_DIR}
-- ${PROJECT_SOURCE_DIR}/../glslang/SPIRV
-+ /usr/include/glslang/SPIRV
- )
-
- if (WIN32)
-diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/tests/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/tests/CMakeLists.txt
---- vulkan-sdk-1.0.5.0.orig/VulkanTools/tests/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
-+++ vulkan-sdk-1.0.5.0/VulkanTools/tests/CMakeLists.txt 2016-03-12 20:42:39.014804320 +0100
-@@ -78,13 +78,13 @@
- IMPORTED_LOCATION_DEBUG "${GLSLANG_PREFIX}/${BUILDTGT_DIR}/SPIRV/Debug/SPIRV.lib")
- else ()
- set_target_properties(glslang PROPERTIES
-- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libglslang.a")
-+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libglslang.a")
- set_target_properties(OGLCompiler PROPERTIES
-- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libOGLCompiler.a")
-+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libOGLCompiler.a")
- set_target_properties(OSDependent PROPERTIES
-- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libOSDependent.a")
-+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libOSDependent.a")
- set_target_properties(SPIRV PROPERTIES
-- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libSPIRV.a")
-+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libSPIRV.a")
- endif()
-
- include_directories(