[Liblas-commits] hg-main-tree: turn off OCI stuff if now Oracle enabled

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/0592edb74697
changeset: 935:0592edb74697
user:      Howard Butler <hobu.inc at gmail.com>
date:      Tue Jul 26 11:52:01 2011 -0500
description:
turn off OCI stuff if now Oracle enabled

diffstat:

 src/StageFactory.cpp |  13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diffs (63 lines):

diff -r c1aa0d010dbf -r 0592edb74697 src/StageFactory.cpp
--- a/src/StageFactory.cpp	Tue Jul 26 07:55:34 2011 -0700
+++ b/src/StageFactory.cpp	Tue Jul 26 11:52:01 2011 -0500
@@ -42,14 +42,18 @@
 #include <pdal/drivers/faux/Reader.hpp>
 #include <pdal/drivers/las/Reader.hpp>
 #include <pdal/drivers/liblas/Reader.hpp>
+#ifdef PDAL_HAVE_ORACLE
 #include <pdal/drivers/oci/Reader.hpp>
+#endif
 #include <pdal/drivers/qfit/Reader.hpp>
 #include <pdal/drivers/terrasolid/Reader.hpp>
 
 #include <pdal/drivers/faux/Writer.hpp>
 #include <pdal/drivers/las/Writer.hpp>
 #include <pdal/drivers/liblas/Writer.hpp>
+#ifdef PDAL_HAVE_ORACLE
 #include <pdal/drivers/oci/Writer.hpp>
+#endif
 
 #include <pdal/filters/ByteSwapFilter.hpp>
 #include <pdal/filters/CacheFilter.hpp>
@@ -83,7 +87,9 @@
 MAKE_READER_CREATOR(FauxReader, pdal::drivers::faux::Reader)
 MAKE_READER_CREATOR(LasReader, pdal::drivers::las::LasReader)
 MAKE_READER_CREATOR(LiblasReader, pdal::drivers::liblas::LiblasReader)
+#ifdef PDAL_HAVE_ORACLE
 MAKE_READER_CREATOR(OciReader, pdal::drivers::oci::Reader)
+#endif
 MAKE_READER_CREATOR(QfitReader, pdal::drivers::qfit::Reader)
 MAKE_READER_CREATOR(TerrasolidReader, pdal::drivers::terrasolid::Reader)
 
@@ -101,8 +107,9 @@
 MAKE_WRITER_CREATOR(FauxWriter, pdal::drivers::faux::Writer)
 MAKE_WRITER_CREATOR(LasWriter, pdal::drivers::las::LasWriter)
 MAKE_WRITER_CREATOR(LiblasWriter, pdal::drivers::liblas::LiblasWriter)
+#ifdef PDAL_HAVE_ORACLE
 MAKE_WRITER_CREATOR(OciWriter, pdal::drivers::oci::Writer)
-
+#endif
 
 
 StageFactory::StageFactory()
@@ -218,7 +225,9 @@
     REGISTER_READER(FauxReader, pdal::drivers::faux::Reader);
     REGISTER_READER(LasReader, pdal::drivers::las::LasReader);
     REGISTER_READER(LiblasReader, pdal::drivers::liblas::LiblasReader);
+#ifdef PDAL_HAVE_ORACLE
     REGISTER_READER(OciReader, pdal::drivers::oci::Reader);
+#endif
     REGISTER_READER(QfitReader, pdal::drivers::qfit::Reader);
     REGISTER_READER(TerrasolidReader, pdal::drivers::terrasolid::Reader);
 }
@@ -257,7 +266,9 @@
     REGISTER_WRITER(FauxWriter, pdal::drivers::faux::Writer);
     REGISTER_WRITER(LasWriter, pdal::drivers::las::LasWriter);
     REGISTER_WRITER(LiblasWriter, pdal::drivers::liblas::LiblasWriter);
+#ifdef PDAL_HAVE_ORACLE
     REGISTER_WRITER(OciWriter, pdal::drivers::oci::Writer);
+#endif
 }