← Back to branch summary

~sil2100/nux/dummy_merge_2.0

« back to all changes in this revision

Viewing changes to tests/Makefile.am

* Fix make check:
  - Fix tests Makefile so that gtest is build and added as a dependency for some of the tests.. Fixes: . Approved by Jay Taoko.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/Makefile.am
1
1
if BUILD_TESTS
 
2
 
 
3
nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc
 
4
 
 
5
libgtest_a_CPPFLAGS = $(GTEST_CPPFLAGS) -w
 
6
libgtest_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS)
 
7
check_LIBRARIES = libgtest.a
 
8
 
2
9
check_PROGRAMS = \
3
10
  gtest-nux \
4
11
  gtest-nuxcore \
19
26
  xtest-text-entry-logic \
20
27
  xtest-focus-on-mouse-enter
21
28
 
22
 
# Please keep alphabetical
23
 
# test_nux_SOURCES = \
24
 
# test-canvas.cpp \
25
 
# test-nux.cpp \
26
 
# test-system.cpp
27
 
 
28
 
#test_nux_CPPFLAGS = \
29
 
#  -I$(srcdir) \
30
 
#  -I$(top_srcdir) \
31
 
#  -DPREFIX=\""$(prefix)"\" \
32
 
#       -DLIBDIR=\""$(libdir)"\" \
33
 
#  -DDATADIR=\""$(datadir)"\" \
34
 
#  -DG_LOG_DOMAIN=\"NuxTests\" \
35
 
#  -DTESTDIR=\""$(top_srcdir)/tests"\" \
36
 
#  $(GCC_FLAGS) \
37
 
#  $(NUX_CORE_CFLAGS) \
38
 
#  $(NUX_EXAMPLES_CFLAGS) \
39
 
#  $(NUX_CFLAGS) \
40
 
#  $(MAINTAINER_CFLAGS)
41
 
 
42
 
#test_nux_LDADD = \
43
 
#  $(top_builddir)/NuxCore/libnux-core-@NUX_API_VERSION@.la \
44
 
#  $(top_builddir)/NuxImage/libnux-image-@NUX_API_VERSION@.la \
45
 
#  $(top_builddir)/NuxGraphics/libnux-graphics-@NUX_API_VERSION@.la \
46
 
#  $(top_builddir)/Nux/libnux-@NUX_API_VERSION@.la \
47
 
#  $(NUX_LIBS)
48
 
 
49
29
gtest_nuxcore_SOURCES = \
50
30
  Helpers.h \
51
31
  Helpers.cpp \
76
56
  $(top_builddir)/NuxImage/libnux-image-@NUX_API_VERSION@.la \
77
57
  $(top_builddir)/NuxGraphics/libnux-graphics-@NUX_API_VERSION@.la \
78
58
  $(top_builddir)/Nux/libnux-@NUX_API_VERSION@.la \
79
 
  $(NUX_LIBS)
 
59
  $(NUX_LIBS) \
 
60
  libgtest.a
80
61
 
81
62
gtest_nuxcore_LDFLAGS = \
82
 
  -lpthread -lgtest -lgmock \
 
63
  -lpthread -lgmock \
83
64
  -lboost_filesystem -lboost_system
84
65
 
85
66
gtest_nux_SOURCES = \
113
94
  $(top_builddir)/NuxImage/libnux-image-@NUX_API_VERSION@.la \
114
95
  $(top_builddir)/NuxGraphics/libnux-graphics-@NUX_API_VERSION@.la \
115
96
  $(top_builddir)/Nux/libnux-@NUX_API_VERSION@.la \
116
 
  $(NUX_LIBS)
 
97
  $(NUX_LIBS) \
 
98
  libgtest.a
117
99
 
118
100
gtest_nux_LDFLAGS = \
119
 
  -lpthread -lgtest -lgmock \
 
101
  -lpthread -lgmock \
120
102
  -lboost_filesystem -lboost_system
121
103
 
122
104
TestFlags = -I$(srcdir) \