mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1919 from dj2/install_spirv

Browse Source 
Move install directory for SPIRV/ folder.
This commit is contained in:
John Kessenich
2019-10-06 21:58:40 -06:00
committed by GitHub
parent 135e3e35ea 78ba2510b8
commit 4b97a11081
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.appveyor.yml
View File

@@ -66,7 +66,6 @@ after_test:
bin\glslangValidator.exe bin\glslangValidator.exe
bin\spirv-remap.exe bin\spirv-remap.exe
include\glslang\* include\glslang\*
include\SPIRV\*
lib\glslang%SUFFIX%.lib lib\glslang%SUFFIX%.lib
lib\HLSL%SUFFIX%.lib lib\HLSL%SUFFIX%.lib
lib\OGLCompiler%SUFFIX%.lib lib\OGLCompiler%SUFFIX%.lib

1
.travis.yml
View File

@@ -99,7 +99,6 @@ after_success:
zip ${TARBALL} zip ${TARBALL}
bin/glslangValidator bin/glslangValidator
include/glslang/* include/glslang/*
include/SPIRV/*
lib/libglslang${SUFFIX}.a lib/libglslang${SUFFIX}.a
lib/libHLSL${SUFFIX}.a lib/libHLSL${SUFFIX}.a
lib/libOGLCompiler${SUFFIX}.a lib/libOGLCompiler${SUFFIX}.a

2
SPIRV/CMakeLists.txt
View File

@@ -87,5 +87,5 @@ if(ENABLE_GLSLANG_INSTALL)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif() 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) endif(ENABLE_GLSLANG_INSTALL)