Merge pull request #1919 from dj2/install_spirv

Move install directory for SPIRV/ folder.
2019-10-06 21:58:40 -06:00 · 2019-10-06 21:58:40 -06:00 · 4b97a11081
commit 4b97a11081
parent 135e3e35ea 78ba2510b8
3 changed files with 1 additions and 3 deletions
--- 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
--- 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
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@ -87,5 +87,5 @@ 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)