Merge pull request #2339 from ben-clayton/cmake-project
CMake: Move project() to top of CMakeLists.txt
diff --git a/LICENSE.txt b/LICENSE.txt
index bc5b242..5f58565 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -298,6 +298,41 @@
See the License for the specific language governing permissions and
limitations under the License.
+
+--------------------------------------------------------------------------------
+GPL 3 with special bison exception
+--------------------------------------------------------------------------------
+
+ Bison implementation for Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison.
+
--------------------------------------------------------------------------------
================================================================================
--------------------------------------------------------------------------------
diff --git a/gtests/Spv.FromFile.cpp b/gtests/Spv.FromFile.cpp
index 714ef3c..2cdd9e3 100644
--- a/gtests/Spv.FromFile.cpp
+++ b/gtests/Spv.FromFile.cpp
@@ -560,7 +560,7 @@
"spv.ext.RayGenShader.rgen",
"spv.ext.RayGenShader11.rgen",
"spv.ext.RayGenShaderArray.rgen",
- "spv.ext.World3x4.rahit",
+ //"spv.ext.World3x4.rahit", this is triggering non-deterministic results
})),
FileNameAsCustomTestSuffix
);
