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

Merge branch 'f-extended-c' into f-consolidation

parents 9664ee6a 33f388f6
No related branches found
No related tags found
1 merge request!12F consolidation
Pipeline #12106 passed
Pipeline: caosdb-cppinttest

#12112

    ......@@ -48,10 +48,9 @@ as compiler. We use [cmake](https://cmake.org/download/) as build tool.
    and build the project. (You can open Tools/Command Line/Developer Command
    Prompt and execute `msbuild libcaosdb.sln /property:Configuration=Release`)
    ### Creating a local Conan package ##
    ### Creating a Local Conan Package ##
    Building and installing libcaosdb with Conan is just a single command:
    `conan create . -s "compiler.libcxx=libstdc++11"`
    Building and installing libcaosdb with Conan is just a single command: `make conan-install`
    For MacOS, you probably should adjust the option as mentioned above.
    ......@@ -65,6 +64,10 @@ the `--build=missing` option: `conan install .. [ other options
    ] --build=missing`. This should download and compile the sources of the
    dependencies.
    #### cmake fails when using the Debug flag
    Depending on the clang version it might be necessary to use additionally the following flag:
    `-DCMAKE_CXX_FLAGS="-Wno-unused-parameter"`
    ## Unit Tests
    ### Build
    ......
    ......@@ -66,9 +66,8 @@ using caosdb::StatusCode;
    using caosdb::entity::v1alpha1::EntityResponse;
    using caosdb::entity::v1alpha1::FileTransmissionId;
    using google::protobuf::RepeatedPtrField;
    using ProtoMessage = caosdb::entity::v1alpha1::Message;
    const static std::string logger_name = "caosdb::entity";
    static const std::string logger_name = "caosdb::entity";
    /**
    * The property importance.
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment