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 diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt index 94d2ebeb..f47c8a0e 100644 --- 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)