OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make: Fix test to be meson compatible

Browse Source 
This has the same problem as the previous commit, generated headers and
hardcoded paths.

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Dylan Baker
2017-10-04 16:11:34 -07:00
parent 1b1bb6ee10
commit fc48ad2427
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mapi/Makefile.am
View File

@@ -85,6 +85,7 @@ check_PROGRAMS += shared-glapi-test
shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp shared_glapi_test_SOURCES = shared-glapi/tests/check_table.cpp
shared_glapi_test_CPPFLAGS = \ shared_glapi_test_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(top_builddir)/src/mapi/glapi \
-I$(top_srcdir)/src/gtest/include -I$(top_srcdir)/src/gtest/include
shared_glapi_test_LDADD = \ shared_glapi_test_LDADD = \
$(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
@@ -148,6 +149,7 @@ check_PROGRAMS += glapi-test
glapi_test_SOURCES = glapi/tests/check_table.cpp glapi_test_SOURCES = glapi/tests/check_table.cpp
glapi_test_CPPFLAGS = \ glapi_test_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-I$(top_builddir)/src/mapi/glapi \
-I$(top_srcdir)/src/gtest/include -I$(top_srcdir)/src/gtest/include
glapi_test_LDADD = \ glapi_test_LDADD = \

2
src/mapi/shared-glapi/tests/check_table.cpp
View File

@@ -25,7 +25,7 @@
#include "../../../mesa/main/glheader.h" #include "../../../mesa/main/glheader.h"
#include "glapi/glapi.h" #include "glapi/glapi.h"
#include "glapi/glapitable.h" #include "glapitable.h"
struct name_offset { struct name_offset {
const char *name; const char *name;