Skip to content
Snippets Groups Projects
Verified Commit f50b9221 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

REVIEW: minor changes in the build, add IWYU pragmas

parent 6d22e2e2
No related branches found
No related tags found
1 merge request!4ENH: Allow insertion and deletion of single entities
Pipeline #11274 passed
Pipeline: caosdb-cppinttest

#11277

    ...@@ -177,7 +177,7 @@ target_link_libraries(ccaosdb ...@@ -177,7 +177,7 @@ target_link_libraries(ccaosdb
    ${CONAN_LIBS} ${CONAN_LIBS}
    ) )
    add_executable(ccaosdbcli src/ccaosdbcli.c) add_executable(ccaosdbcli EXCLUDE_FROM_ALL src/ccaosdbcli.c)
    target_include_directories(ccaosdbcli PUBLIC target_include_directories(ccaosdbcli PUBLIC
    $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
    $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
    ...@@ -189,7 +189,7 @@ target_link_libraries(ccaosdbcli ...@@ -189,7 +189,7 @@ target_link_libraries(ccaosdbcli
    ${CONAN_LIBS} ${CONAN_LIBS}
    ) )
    add_executable(cxxcaosdbcli src/cxxcaosdbcli.cpp) add_executable(cxxcaosdbcli EXCLUDE_FROM_ALL src/cxxcaosdbcli.cpp)
    target_include_directories(cxxcaosdbcli PUBLIC target_include_directories(cxxcaosdbcli PUBLIC
    $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
    $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include> $<BUILD_INTERFACE:${libcaosdb_BINARY_DIR}/include>
    ......
    ...@@ -26,9 +26,10 @@ ...@@ -26,9 +26,10 @@
    #include "boost/json/object.hpp" // for object #include "boost/json/object.hpp" // for object
    #include "boost/json/value.hpp" // for value #include "boost/json/value.hpp" // for value
    #include "boost/json/value_ref.hpp" // IWYU pragma: keep #include "boost/json/value_ref.hpp" // IWYU pragma: keep
    #include "caosdb/authentication.h" // for Authenticator, PlainPassw... // IWYU pragma: no_include "boost/json/fwd.hpp"
    #include "caosdb/certificate_provider.h" // for CertificateProvider, path #include "caosdb/authentication.h" // for Authenticator, PlainPassw...
    #include "caosdb/exceptions.h" // for ConfigurationError #include "caosdb/certificate_provider.h" // for CertificateProvider, path
    #include "caosdb/exceptions.h" // for ConfigurationError
    #include "caosdb/logging.h" #include "caosdb/logging.h"
    #include "caosdb/utility.h" // for load_json_file #include "caosdb/utility.h" // for load_json_file
    #include "grpcpp/security/credentials.h" // for ChannelCredentials #include "grpcpp/security/credentials.h" // for ChannelCredentials
    ......
    ...@@ -154,8 +154,9 @@ auto Transaction::InsertEntity(Entity *entity) -> void { ...@@ -154,8 +154,9 @@ auto Transaction::InsertEntity(Entity *entity) -> void {
    auto Transaction::Execute() -> TransactionStatus { auto Transaction::Execute() -> TransactionStatus {
    ExecuteAsynchronously(); ExecuteAsynchronously();
    this->status.ThrowExceptionIfError(); auto status = WaitForIt();
    return this->status; status.ThrowExceptionIfError();
    return status;
    } }
    auto Transaction::ExecuteAsynchronously() noexcept -> void { auto Transaction::ExecuteAsynchronously() noexcept -> void {
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment