Merge branch 'master' of github.com:PDAL/PDAL

PDAL · Jul 17, 2013 · 2fc21bc · 2fc21bc
2 parents 5ed0208 + 54d9bb9
commit 2fc21bc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -782,23 +782,6 @@ if (USE_PDAL_PLUGIN_OCI)
       PROPERTIES
       INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
     endif()
-
-    set(PDAL_OCI_READER_LIB_NAME pdal_plugin_reader_oci)
-    add_library(${PDAL_OCI_READER_LIB_NAME} SHARED ${PDAL_ORACLE_SRC}/oci_wrapper.cpp
-                                                    ${PDAL_ORACLE_SRC}/common.cpp
-                                                    ${PDAL_ORACLE_SRC}/Reader.cpp)
-    target_link_libraries(${PDAL_OCI_READER_LIB_NAME}
-                          ${PDAL_LIB_NAME}
-                          ${ORACLE_LIBRARY})
-    set_target_properties(${PDAL_OCI_READER_LIB_NAME}
-    PROPERTIES SOVERSION "${PDAL_LIB_SOVERSION}" )
-    if (APPLE)
-    set_target_properties(
-      ${PDAL_OCI_READER_LIB_NAME}
-      PROPERTIES
-      INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-    endif()
-
 endif()
 endif()
 ###############################################################################

diff --git a/test/unit/drivers/buffer/BufferReaderTest.cpp b/test/unit/drivers/buffer/BufferReaderTest.cpp
@@ -306,7 +306,7 @@ BOOST_AUTO_TEST_CASE(test_iterator_write)
     boost::uint64_t numWritten = writer.write(100);
 
     BOOST_CHECK_EQUAL(numWritten, 100u);
-    FileUtils::deleteFile(Support::temppath(out_filename.getValue<std::string>()));    
+    FileUtils::deleteFile(out_filename.getValue<std::string>());
 
     return;
 }