Commit 0cafb3f6 authored by Manuel Wudka-Robles's avatar Manuel Wudka-Robles
Browse files

Merge pull request #11 from Seagate/features/header-reorg 

Don't include the C++ client's src/main directory.
parents bd57477d 08b55363

CMakeLists.txt

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ else(USE_LOCAL_KINETIC_CLIENT) 
        kinetic_cpp_client

        PREFIX "vendor"

        GIT_REPOSITORY "git@github.com:Seagate/Kinetic-C-Client.git"

        GIT_TAG "aec51b65cec4fda90ed4f1ac50e5ba4d01bf4dce"

        GIT_TAG "580b8715eaf037b737fbfded246c22a0158073d6"

        BUILD_IN_SOURCE 1

        INSTALL_COMMAND ""

    )
@@ -28,7 +28,6 @@ include_directories( 
    ${KINETIC_CLIENT_PATH}/vendor/src/protobufutil/vendor/include

    ${KINETIC_CLIENT_PATH}/vendor/src/protobufutil/include

    ${KINETIC_CLIENT_PATH}/vendor/src/protobufutil/vendor/src/gmock/fused-src

    ${KINETIC_CLIENT_PATH}/src/main

    ${KINETIC_CLIENT_PATH}/src/main/generated

    ${KINETIC_CLIENT_PATH}/include

)

src/delete_file_blocking.cc

+2 −5
Original line number Diff line number Diff line
@@ -2,11 +2,8 @@ 


#include <stdio.h>



#include "protobufutil/message_stream.h"



#include "kinetic/connection_options.h"

#include "kinetic/kinetic_connection_factory.h"

#include "socket_wrapper.h"

#include "kinetic/kinetic.h"

#include "glog/logging.h"



using com::seagate::kinetic::proto::Message_Algorithm_SHA1;

using kinetic::KineticConnectionFactory;

src/delete_file_nonblocking.cc

+2 −5
Original line number Diff line number Diff line
@@ -2,11 +2,8 @@ 


#include <stdio.h>



#include "protobufutil/message_stream.h"



#include "kinetic/connection_options.h"

#include "kinetic/kinetic_connection_factory.h"

#include "socket_wrapper.h"

#include "kinetic/kinetic.h"

#include "glog/logging.h"



using kinetic::KineticConnectionFactory;

using kinetic::KineticRecord;

src/firmware_update.cc

+1 −4
Original line number Diff line number Diff line
@@ -3,10 +3,7 @@ 
#include <stdio.h>

#include <fstream>



#include "protobufutil/message_stream.h"



#include "kinetic/connection_options.h"

#include "kinetic/kinetic_connection_factory.h"

#include "kinetic/kinetic.h"



using kinetic::KineticConnectionFactory;

using kinetic::Status;

src/ise.cc

+1 −4
Original line number Diff line number Diff line
@@ -2,10 +2,7 @@ 


#include <stdio.h>



#include "protobufutil/message_stream.h"



#include "kinetic/connection_options.h"

#include "kinetic/kinetic_connection_factory.h"

#include "kinetic/kinetic.h"



using kinetic::KineticConnectionFactory;

using kinetic::Status;