From c48dacbb55f62ff9aedd8351b46d3e6737c1def3 Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Tue, 16 Jul 2013 11:27:19 -0600 Subject: [PATCH 1/2] Remove duplicate lines from src/CMakeLists The duplicate lines were in the OCI plugin code. --- src/CMakeLists.txt | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5dbd79e8bd..e060685a68 100644 --- 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() ############################################################################### From acda6ff9aaa6de92f6824523a6c09545d15108bf Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Wed, 17 Jul 2013 09:46:21 -0600 Subject: [PATCH 2/2] Delete temporary test file after use Fix an incorrect call to FileUtils::deleteFile that meant that a test wasn't cleaning up after itself. --- test/unit/drivers/buffer/BufferReaderTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/drivers/buffer/BufferReaderTest.cpp b/test/unit/drivers/buffer/BufferReaderTest.cpp index fcf07501a1..8443642df8 100644 --- 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())); + FileUtils::deleteFile(out_filename.getValue()); return; }