summaryrefslogtreecommitdiff
path: root/lib/mesa/src/gtest
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2019-01-29 10:51:18 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2019-01-29 10:51:18 +0000
commit726e4bceb8bf5b8123eda80e45a9fdeb016f3790 (patch)
tree32ed745d6aeb44b4c130f647e49d6627320a3857 /lib/mesa/src/gtest
parent5c0a71df6e14d3ae04cc0faa6dad6e5d0a01d27a (diff)
Import Mesa 18.3.2
Diffstat (limited to 'lib/mesa/src/gtest')
-rw-r--r--lib/mesa/src/gtest/Makefile.am3
-rw-r--r--lib/mesa/src/gtest/meson.build32
2 files changed, 34 insertions, 1 deletions
diff --git a/lib/mesa/src/gtest/Makefile.am b/lib/mesa/src/gtest/Makefile.am
index 29d6c6d19..23b755361 100644
--- a/lib/mesa/src/gtest/Makefile.am
+++ b/lib/mesa/src/gtest/Makefile.am
@@ -37,4 +37,5 @@ EXTRA_DIST = \
src/gtest-port.cc \
src/gtest-printers.cc \
src/gtest-test-part.cc \
- src/gtest-typed-test.cc
+ src/gtest-typed-test.cc \
+ meson.build
diff --git a/lib/mesa/src/gtest/meson.build b/lib/mesa/src/gtest/meson.build
new file mode 100644
index 000000000..23c21423d
--- /dev/null
+++ b/lib/mesa/src/gtest/meson.build
@@ -0,0 +1,32 @@
+# Copyright © 2017 Intel Corporation
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+libgtest = static_library(
+ 'gtest',
+ files('src/gtest-all.cc', 'src/gtest_main.cc'),
+ include_directories : include_directories('include'),
+ cpp_args : '-w',
+ build_by_default : false,
+)
+
+idep_gtest = declare_dependency(
+ link_with : libgtest,
+ include_directories : include_directories('include', is_system : true),
+)