Compilation fixes for Ubuntu 14.04.

PDAL · Dec 8, 2015 · 6409766 · 6409766
1 parent e03f93c
commit 6409766
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/cmake/geos.cmake b/cmake/geos.cmake
@@ -5,14 +5,8 @@ find_package(GEOS QUIET 3.3)
 set_package_properties(GEOS PROPERTIES TYPE OPTIONAL
     PURPOSE "Provides general purpose geometry support")
 if (GEOS_FOUND)
-    find_file(GEOS_VERSION_H version.h "${GEOS_INCLUDE_DIR}/geos")
-    if ("${GEOS_VERSION_H}" STREQUAL "GEOS_VERSION_H-NOTFOUND")
-        set(GEOS_LIBRARY "")
-        set(GEOS_FOUND FALSE)
-    else()
-        include_directories("${GEOS_INCLUDE_DIR}")
-        set(PDAL_HAVE_GEOS 1)
-    endif()
+    include_directories("${GEOS_INCLUDE_DIR}")
+    set(PDAL_HAVE_GEOS 1)
 else()
     set(GEOS_LIBRARY "")
 endif()
diff --git a/include/pdal/Compression.hpp b/include/pdal/Compression.hpp
@@ -139,7 +139,9 @@ class TypedLazPerfBuf
     {}
 
     void putBytes(const unsigned char *b, size_t len)
-        { m_buf.insert(m_buf.end(), (CTYPE *)b, (CTYPE *)(b + len)); }
+    {
+        m_buf.insert(m_buf.end(), (const CTYPE *)b, (const CTYPE *)(b + len));
+    }
     void putByte(const unsigned char b)
         {   m_buf.push_back((CTYPE)b); }
     unsigned char getByte()

diff --git a/include/pdal/Geometry.hpp b/include/pdal/Geometry.hpp
@@ -96,7 +96,8 @@ static void finish()
 namespace Geometry
 {
 
-static std::string smoothPolygon(const std::string& wkt, double tolerance, uint32_t precision, double area_threshold)
+static std::string smoothPolygon(const std::string& wkt, double tolerance,
+    uint32_t precision, double area_threshold)
 {
     GEOSContextHandle_t env = init();
 
@@ -186,16 +187,31 @@ static double computeArea(const std::string& wkt)
     finish();
     return output;
 }
+
+} // namespace Geometry
+
 #else
 
-static std::string smoothPolygon(const std::string& wkt, double tolerance)
+namespace Geometry
+{
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+static std::string smoothPolygon(const std::string& wkt, double tolerance,
+    uint32_t precision, double area_threshold)
 {
     throw pdal_error("Can't call smoothPolygon.  PDAL not built with GEOS.");
 }
 
-#endif
+static double computeArea(const std::string& wkt)
+{
+    throw pdal_error("Can't call computeArea.  PDAL not built with GEOS.");
+}
+#pragma GCC diagnostic pop
 
 } // namespace Geometry
 
+#endif
+
 } // namespace pdal
 
diff --git a/src/pdal_config.cpp b/src/pdal_config.cpp
@@ -67,7 +67,7 @@
 #endif
 
 #ifdef PDAL_HAVE_GEOS
-#include <geos/version.h>
+#include <geos_c.h>
 #endif
 
 #ifdef PDAL_HAVE_HEXER