From 7b0e236325fa9e8ebc7f446f83797a20a2263b70 Mon Sep 17 00:00:00 2001
From: dan sinclair <dj2@everburning.com>
Date: Thu, 3 Oct 2019 19:35:44 -0400
Subject: [PATCH 1/3] Move install directory for SPIRV/ folder.

Currently the SPIRV/ folder will get installed into the include
directory. This folder is part of GLSLang, so it makes more sense under
glslang/SPIRV.

Currently, GLSLang will install a SPIRV/ folder while spirv-headers will
install a spirv/ folder. This is confusing and will cause issues on a
case sensitive filesystem if both are installed at the same time.
---
 SPIRV/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
index 94d2ebeb..a666412c 100644
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -87,5 +87,6 @@ if(ENABLE_GLSLANG_INSTALL)
                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif()
 
-    install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/)
+    install(FILES ${HEADERS} ${SPVREMAP_HEADERS}
+            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
 endif(ENABLE_GLSLANG_INSTALL)

From c13e0f1e99025e13973bd831d3bd928ce258a42d Mon Sep 17 00:00:00 2001
From: dan sinclair <dj2@everburning.com>
Date: Thu, 3 Oct 2019 20:24:30 -0400
Subject: [PATCH 2/3] Update appveyor and travis files

---
 .appveyor.yml | 1 -
 .travis.yml   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e7c42827..32e8f2bd 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -66,7 +66,6 @@ after_test:
     bin\glslangValidator.exe
     bin\spirv-remap.exe
     include\glslang\*
-    include\SPIRV\*
     lib\glslang%SUFFIX%.lib
     lib\HLSL%SUFFIX%.lib
     lib\OGLCompiler%SUFFIX%.lib
diff --git a/.travis.yml b/.travis.yml
index 24789121..1fa3fc01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,7 +99,6 @@ after_success:
       zip ${TARBALL}
         bin/glslangValidator
         include/glslang/*
-        include/SPIRV/*
         lib/libglslang${SUFFIX}.a
         lib/libHLSL${SUFFIX}.a
         lib/libOGLCompiler${SUFFIX}.a

From 78ba2510b869830412e1d82accb6110e3b93aabd Mon Sep 17 00:00:00 2001
From: dan sinclair <dj2@everburning.com>
Date: Sun, 6 Oct 2019 10:00:37 -0400
Subject: [PATCH 3/3] single line

---
 SPIRV/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
index a666412c..f47c8a0e 100644
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -87,6 +87,5 @@ if(ENABLE_GLSLANG_INSTALL)
                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
     endif()
 
-    install(FILES ${HEADERS} ${SPVREMAP_HEADERS}
-            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
+    install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
 endif(ENABLE_GLSLANG_INSTALL)