Commit 5c1d22db authored by Michael Davis's avatar Michael Davis
Browse files

[migration] Updates with master

parent 6ca0965a
......@@ -29,11 +29,7 @@ set_property(TARGET eos-import-dirs APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RP
set_property(TARGET eos-import-dirs APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
# File import tool
<<<<<<< HEAD
add_executable(eos-import-files EosImportFilesCmd.cpp EosImportFiles.cpp GrpcClient.cpp GrpcUtils.cpp)
=======
add_executable(eos-import-files EosImportFiles.cpp GrpcClient.cpp GrpcUtils.cpp)
>>>>>>> b7e21512629007f604f1230efd701e6d50d1e799
target_link_libraries(eos-import-files EosMigration ${PROTOBUF3_LIBRARIES} ${GRPC_LIBRARY} ${GRPC_GRPC++_LIBRARY} ctacatalogue)
set_property(TARGET eos-import-files APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
set_property(TARGET eos-import-files APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
......@@ -45,10 +41,6 @@ set_property(TARGET eos-import-files APPEND PROPERTY INSTALL_RPATH ${ORACLE-INST
#set_property(TARGET eos-insert-missing-dirs APPEND PROPERTY INSTALL_RPATH ${ORACLE-INSTANTCLIENT_RPATH})
# Standalone test tools
<<<<<<< HEAD
=======
>>>>>>> b7e21512629007f604f1230efd701e6d50d1e799
#add_executable(grpc-utils-test GrpcUtilsTest.cpp GrpcUtils.cpp)
add_executable(eos-test-dir-inject EosTestDirInject.cpp GrpcClient.cpp GrpcUtils.cpp)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment