From c2da3ad626822e0d4cd93c301523d359966044e8 Mon Sep 17 00:00:00 2001
From: Pete Gadomski <pete.gadomski@gmail.com>
Date: Fri, 13 Jan 2017 16:12:58 +0000
Subject: [PATCH] Fix up rivlib tests to actually build and run

---
 plugins/rxp/CMakeLists.txt         | 4 +++-
 plugins/rxp/test/RxpReaderTest.cpp | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/rxp/CMakeLists.txt b/plugins/rxp/CMakeLists.txt
index 0a31fa165d..acf5f7fbcb 100644
--- a/plugins/rxp/CMakeLists.txt
+++ b/plugins/rxp/CMakeLists.txt
@@ -12,8 +12,9 @@ PDAL_ADD_PLUGIN(libname reader rxp
         io/RxpReader.cpp
     LINK_WITH
         ${RiVLib_SCANLIB_LIBRARY})
-target_include_directories(${libname} PRIVATE ${RiVLib_INCLUDE_DIRS})
+target_include_directories(${libname} PUBLIC ${RiVLib_INCLUDE_DIRS})
 
+option(BUILD_RIVLIB_TESTS "Build rivlib tests" ON)
 if (BUILD_RIVLIB_TESTS)
     configure_file(
         test/Config.hpp.in
@@ -24,5 +25,6 @@ if (BUILD_RIVLIB_TESTS)
         FILES test/RxpReaderTest.cpp
         LINK_WITH ${libname})
     target_include_directories(${RXP_TEST_NAME} PRIVATE
+        ${PROJECT_BINARY_DIR}/plugins/rxp/test
         ${PROJECT_SOURCE_DIR}/plugins/rxp/io)
 endif()
diff --git a/plugins/rxp/test/RxpReaderTest.cpp b/plugins/rxp/test/RxpReaderTest.cpp
index e032e183cf..4ff8448a6a 100644
--- a/plugins/rxp/test/RxpReaderTest.cpp
+++ b/plugins/rxp/test/RxpReaderTest.cpp
@@ -39,7 +39,6 @@
 #include <pdal/Options.hpp>
 #include <pdal/PipelineManager.hpp>
 #include <pdal/PointView.hpp>
-#include "PipelineReader.hpp"
 
 #include "RxpReader.hpp"
 #include "Config.hpp"