diff options
author | Kenneth Benzie <k.benzie@codeplay.com> | 2015-08-17 07:58:16 -0400 |
---|---|---|
committer | Kenneth Benzie <k.benzie@codeplay.com> | 2015-08-17 07:58:16 -0400 |
commit | 17f1bae331c6020bf7c0a91f70da73d5a593e5ac (patch) | |
tree | cbca6c69641f671b2f35b5e530653b4a63de60c3 /external | |
parent | 67cdf9fba61d4c6c8b29cc746b72865adae27b4b (diff) | |
parent | e3800df71c3a36ee5e1185b46034679fffdf58d6 (diff) | |
download | spirv-tools-17f1bae331c6020bf7c0a91f70da73d5a593e5ac.tar.gz |
Merge branch 'avoid-cmake-target-conflicts' into 'master'
Avoid cmake target conflicts
This makes it easier to include spirv-tools into larger cmake-based
projects, which may already include glslang or googletest. It is
currently difficult to do this because of target clashes and a
hardcoded googletest path.
glslang defines a target named SPIRV, so rename ours to SPIRV-TOOLS.
A googletest subdirectory may already be added somewhere else, so if
the external/googletest directory does not exist, probe whether there
is a gtest target defined already. This makes spirv-tools work
out-of-the-box when plopped into a larger project already containing
googletest; otherwise the README.md procedure still works as before.
See merge request !1
Diffstat (limited to 'external')
0 files changed, 0 insertions, 0 deletions