[Liblas-commits] libpc: #ifdef Oracle out of the way

[liblas-commits at liblas.org]

details:   http://hg.liblas.orglibpc/rev/221d3a3d6a54
changeset: 207:221d3a3d6a54
user:      Howard Butler <hobu.inc at gmail.com>
date:      Thu Mar 10 21:20:01 2011 -0600
description:
#ifdef Oracle out of the way

diffstat:

 CMakeLists.txt |  2 +-
 apps/pc2pc.cpp |  8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 5a15af27864a -r 221d3a3d6a54 CMakeLists.txt
--- a/CMakeLists.txt	Thu Mar 10 18:17:28 2011 -0800
+++ b/CMakeLists.txt	Thu Mar 10 21:20:01 2011 -0600
@@ -266,7 +266,7 @@
 
   if(ORACLE_FOUND)
     include_directories(${ORACLE_INCLUDE_DIR})
-        set(LIBPC_HAVE_ORACLE 1)
+    add_definitions(-DHAVE_ORACLE=1)
   endif()
 endif()
 
diff -r 5a15af27864a -r 221d3a3d6a54 apps/pc2pc.cpp
--- a/apps/pc2pc.cpp	Thu Mar 10 18:17:28 2011 -0800
+++ b/apps/pc2pc.cpp	Thu Mar 10 21:20:01 2011 -0600
@@ -33,7 +33,6 @@
 
 #include "libpc/../../src/drivers/oci/writer.hpp"
 
-
 #include "Application.hpp"
 
 using namespace libpc;
@@ -120,10 +119,12 @@
         assert(numPoints == np); // BUG
         writer.write(np);
     }
+
+
     else if (hasOption("oracle"))
     {
         LasReader reader(*ifs);
-    
+        std::cout << "running oracle test" << std::endl;
         const boost::uint64_t numPoints = reader.getHeader().getNumPoints();
         
         libpc::driver::oci::Options options;
@@ -145,8 +146,9 @@
 
         size_t np = (size_t)numPoints;
         assert(numPoints == np); // BUG
-        writer.write(np);
+         writer.write(np);
     }    
+
     else
     {
         LiblasReader reader(*ifs);