Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
4b97a110
Unverified
Commit
4b97a110
authored
Oct 06, 2019
by
John Kessenich
Committed by
GitHub
Oct 06, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1919 from dj2/install_spirv
Move install directory for SPIRV/ folder.
parents
135e3e35
78ba2510
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
3 deletions
+1
-3
.appveyor.yml
.appveyor.yml
+0
-1
.travis.yml
.travis.yml
+0
-1
CMakeLists.txt
SPIRV/CMakeLists.txt
+1
-1
No files found.
.appveyor.yml
View file @
4b97a110
...
...
@@ -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
...
...
.travis.yml
View file @
4b97a110
...
...
@@ -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
...
...
SPIRV/CMakeLists.txt
View file @
4b97a110
...
...
@@ -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
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment