[Liblas-commits] hg-main-tree: allow pcinfo build w/out mrsid configured

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/e76335979a24
changeset: 373:e76335979a24
user:      Kirk McKelvey <kirkoman at lizardtech.com>
date:      Fri Mar 18 11:19:49 2011 -0500
description:
allow pcinfo build w/out mrsid configured

diffstat:

 CMakeLists.txt  |  1 +
 apps/pcinfo.cpp |  4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diffs (37 lines):

diff -r fa468a10815f -r e76335979a24 CMakeLists.txt
--- a/CMakeLists.txt	Fri Mar 18 11:03:09 2011 -0500
+++ b/CMakeLists.txt	Fri Mar 18 11:19:49 2011 -0500
@@ -342,6 +342,7 @@
     if(MRSID_FOUND)
         set(CMAKE_REQUIRED_LIBRARIES ${MRSID_LIBRARY})
         include_directories(${MRSID_INCLUDE_DIR})
+        add_definitions(-DHAVE_MRSID=1)
     endif()
 endif()
 
diff -r fa468a10815f -r e76335979a24 apps/pcinfo.cpp
--- a/apps/pcinfo.cpp	Fri Mar 18 11:03:09 2011 -0500
+++ b/apps/pcinfo.cpp	Fri Mar 18 11:19:49 2011 -0500
@@ -12,7 +12,9 @@
 
 #include <libpc/drivers/las/Reader.hpp>
 #include <libpc/drivers/liblas/Reader.hpp>
+#ifdef HAVE_MRSID
 #include <libpc/drivers/mrsid/Reader.hpp>
+#endif
 
 #include <iostream>
 
@@ -92,10 +94,12 @@
             else
                 reader = new libpc::drivers::liblas::LiblasReader(*ifs);
         }
+#ifdef HAVE_MRSID
         else if (!m_inputFile.substr(ext).compare("sid"))
         {
             reader = new libpc::drivers::mrsid::Reader(m_inputFile.c_str());
         }
+#endif
     }
     else
     {