[Liblas-commits] hg-main-tree: clean up includes a bit in Chipper

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/99d1fd94a472
changeset: 365:99d1fd94a472
user:      Howard Butler <hobu.inc at gmail.com>
date:      Fri Mar 18 09:07:26 2011 -0500
description:
clean up includes a bit in Chipper
Subject: hg-main-tree: merge

details:   http://hg.libpc.orghg-main-tree/rev/2e564fcd8c21
changeset: 366:2e564fcd8c21
user:      Howard Butler <hobu.inc at gmail.com>
date:      Fri Mar 18 09:07:37 2011 -0500
description:
merge

diffstat:

 CMakeLists.txt            |  4 +++-
 include/libpc/Chipper.hpp |  3 ++-
 src/Chipper.cpp           |  5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r d68bcc7451fb -r 2e564fcd8c21 CMakeLists.txt
--- a/CMakeLists.txt	Fri Mar 18 09:02:12 2011 -0500
+++ b/CMakeLists.txt	Fri Mar 18 09:07:37 2011 -0500
@@ -317,7 +317,8 @@
 set(WITH_STATIC_LIBLAS FALSE CACHE BOOL "Choose if libLAS should be statically linked")
 mark_as_advanced(WITH_STATIC_LIBLAS)
 
-find_package(LibLAS 1.6.0)
+if(WITH_LIBLAS)
+    find_package(LibLAS 1.6.0)
     if(LIBLAS_FOUND)
         set(CMAKE_REQUIRED_LIBRARIES ${LIBLAS_LIBRARY})
         include_directories(${LIBLAS_INCLUDE_DIR})
@@ -326,6 +327,7 @@
         mark_as_advanced(CLEAR LIBLAS_VERSION) 
         set(LIBPC_HAVE_LIBLAS 1)
     endif()
+endif()
 
 if (NOT LIBLAS_FOUND)
   message(FATAL_ERROR
diff -r d68bcc7451fb -r 2e564fcd8c21 include/libpc/Chipper.hpp
--- a/include/libpc/Chipper.hpp	Fri Mar 18 09:02:12 2011 -0500
+++ b/include/libpc/Chipper.hpp	Fri Mar 18 09:07:37 2011 -0500
@@ -1,7 +1,6 @@
 #ifndef LIBLAS_CHIPPER_H
 #define LIBLAS_CHIPPER_H
 
-#include <libpc/Stage.hpp>
 #include <libpc/PointData.hpp>
 #include <libpc/Bounds.hpp>
 #include <libpc/export.hpp>
@@ -13,6 +12,8 @@
 {
 
 class Schema;
+class Stage;
+class CacheFilter;
     
 namespace chipper
 {
diff -r d68bcc7451fb -r 2e564fcd8c21 src/Chipper.cpp
--- a/src/Chipper.cpp	Fri Mar 18 09:02:12 2011 -0500
+++ b/src/Chipper.cpp	Fri Mar 18 09:07:37 2011 -0500
@@ -38,7 +38,10 @@
  * OF SUCH DAMAGE.
  ****************************************************************************/
 
-#include <libpc/chipper.hpp>
+#include <libpc/Chipper.hpp>
+#include <libpc/Header.hpp>
+#include <libpc/Stage.hpp>
+#include <libpc/filters/CacheFilter.hpp>
 #include <libpc/Utils.hpp>
 // boost
 #include <boost/cstdint.hpp>