Conditionally exclude python-dependent filters

Programmable and Predicate.
PDAL · May 20, 2014 · 52c2bf4 · 52c2bf4
1 parent 7b79183
commit 52c2bf4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/include/pdal/Filters.hpp b/include/pdal/Filters.hpp
@@ -50,8 +50,10 @@
 #ifdef PDAL_HAVE_PCL
 #include <pdal/filters/PCLBlock.hpp>
 #endif
+#ifdef PDAL_HAVE_PYTHON
 #include <pdal/filters/Predicate.hpp>
 #include <pdal/filters/Programmable.hpp>
+#endif
 #include <pdal/filters/Reprojection.hpp>
 #include <pdal/filters/Scaling.hpp>
 #include <pdal/filters/Selector.hpp>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -559,8 +559,6 @@ set(PDAL_FILTERS_HPP
   "${PDAL_FILTERS_HEADERS}/InPlaceReprojection.hpp"
   "${PDAL_FILTERS_HEADERS}/Mosaic.hpp"
   "${PDAL_FILTERS_HEADERS}/PointBufferCache.hpp"
-  "${PDAL_FILTERS_HEADERS}/Predicate.hpp"
-  "${PDAL_FILTERS_HEADERS}/Programmable.hpp"
   "${PDAL_FILTERS_HEADERS}/Reprojection.hpp"
   "${PDAL_FILTERS_HEADERS}/Scaling.hpp"
   "${PDAL_FILTERS_HEADERS}/Selector.hpp"
@@ -579,8 +577,6 @@ set (PDAL_FILTERS_CPP
   "${PDAL_FILTERS_SRC}/InPlaceReprojection.cpp"
   "${PDAL_FILTERS_SRC}/Mosaic.cpp"
   "${PDAL_FILTERS_SRC}/PointBufferCache.cpp"
-  "${PDAL_FILTERS_SRC}/Predicate.cpp"
-  "${PDAL_FILTERS_SRC}/Programmable.cpp"  
   "${PDAL_FILTERS_SRC}/Reprojection.cpp"
   "${PDAL_FILTERS_SRC}/Scaling.cpp"
   "${PDAL_FILTERS_SRC}/Selector.cpp"
@@ -592,6 +588,25 @@ list (APPEND PDAL_CPP ${PDAL_FILTERS_CPP} )
 list (APPEND PDAL_HPP ${PDAL_FILTERS_HPP} )
 
 
+#
+# Core components that depend on Python
+#
+set(PDAL_PYTHON_HPP
+    ${PDAL_FILTERS_HEADERS}/Predicate.hpp
+    ${PDAL_FILTERS_HEADERS}/Programmable.hpp
+    )
+
+set(PDAL_PYTHON_CPP
+    ${PDAL_FILTERS_SRC}/Predicate.cpp
+    ${PDAL_FILTERS_SRC}/Programmable.cpp
+    )
+
+if (WITH_PYTHON)
+    list(APPEND PDAL_HPP ${PDAL_PYTHON_HPP})
+    list(APPEND PDAL_CPP ${PDAL_PYTHON_CPP})
+endif (WITH_PYTHON)
+
+
 #
 # Core components that depend on GDAL
 #