Merge remote-tracking branch 'origin/master'

PDAL · Feb 24, 2015 · 9d9e701 · 9d9e701
2 parents c6345bf + 8aa6064
commit 9d9e701
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,7 +65,7 @@ ENDIF("${isSystemDir}" STREQUAL "-1")
 
 # wipe lib/ drectory on clean. It will have plugins that could be out of date
 # in the next build
-set_directory_properties(PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${PDAL_OUTPUT_LIB_DIR}")
+set_directory_properties(PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${PDAL_OUTPUT_LIB_DIR}/*")
 
 if(WIN32)
   add_definitions("-DPDAL_DLL_EXPORT=1")

diff --git a/plugins/hexbin/test/HexbinFilterTest.cpp b/plugins/hexbin/test/HexbinFilterTest.cpp
@@ -61,6 +61,7 @@ TEST(HexbinFilterTest, HexbinFilterTest_test_1)
 
     Options options;
     options.add("filename", Support::datapath("las/hextest.las"));
+    options.add("output_tesselation", true);
     options.add("sample_size", 5000, "Number of samples to use "
         "when estimating hexagon edge size. Specify 0.0 for edge_size if "
         "you want to compute one.");