diff options
| author | Gary E. Miller <gem@rellim.com> | 2018-11-09 11:40:32 -0800 |
|---|---|---|
| committer | Gary E. Miller <gem@rellim.com> | 2018-11-09 11:40:32 -0800 |
| commit | a107121bb68f6e8f75c48fd670a96659c1289748 (patch) | |
| tree | 36c1bb1a186cdc2112c8b151665064f06c182b8c | |
| parent | 52c9138aacbaf0300af6b3a3ffbc77271f9d5019 (diff) | |
| download | gpsd-a107121bb68f6e8f75c48fd670a96659c1289748.tar.gz | |
test_gpsmm: Fix to build in new tests/ directory.
| -rw-r--r-- | SConstruct | 6 | ||||
| -rw-r--r-- | tests/test_gpsmm.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -1378,7 +1378,8 @@ else: LIBS=['gps_static'], parse_flags=["-lm"] + rtlibs + usbflags + dbusflags) -test_gpsmm = env.Program('test_gpsmm', ['test_gpsmm.cpp'], +# duplicate below? +test_gpsmm = env.Program('tests/test_gpsmm', ['tests/test_gpsmm.cpp'], LIBS=['gps_static'], parse_flags=["-lm"] + rtlibs + dbusflags) testprogs = [test_bits, test_float, test_geoid, test_libgps, test_matrix, @@ -1788,7 +1789,8 @@ build = env.Alias('build', "libgps.pc", "gpsd.rules"]) if qt_env: - test_qgpsmm = env.Program('test_qgpsmm', ['test_gpsmm.cpp'], + # duplicate above? + test_qgpsmm = env.Program('tests/test_qgpsmm', ['tests/test_gpsmm.cpp'], LIBPATH=['.'], OBJPREFIX='qt-', LIBS=['Qgpsmm']) diff --git a/tests/test_gpsmm.cpp b/tests/test_gpsmm.cpp index 4106b476..53420182 100644 --- a/tests/test_gpsmm.cpp +++ b/tests/test_gpsmm.cpp @@ -11,8 +11,8 @@ #include <getopt.h> -#include "libgpsmm.h" -#include "gpsdclient.c" +#include "../libgpsmm.h" +#include "../gpsdclient.c" /* YES ---> ^^^^ Using .c rather than the .h to embed gpsd_source_spec() source here so that it is compiled in C++ rather than C of the gps library |