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

Merge branch 'dev' into f-move-entity

parents 6583f355 f85d05ed
Branches
Tags
1 merge request!27F move entity
Pipeline #14793 passed
Pipeline: caosdb-cppinttest

#14797

    ...@@ -74,6 +74,13 @@ dependencies. ...@@ -74,6 +74,13 @@ dependencies.
    Depending on the clang version it might be necessary to use additionally the following flag: Depending on the clang version it might be necessary to use additionally the following flag:
    `-DCMAKE_CXX_FLAGS="-Wno-unused-parameter"` `-DCMAKE_CXX_FLAGS="-Wno-unused-parameter"`
    #### conan uses outdated cppstd during install
    If you experience compiler errors during a `conan install` process due
    to, e.g., `std::string_view` being unavailable, try specifying the cpp
    standard manually by `conan install .. [other options] -s
    "compiler.cppstd=17"`.
    ## Unit Tests ## Unit Tests
    ### Build ### Build
    ...@@ -83,10 +90,10 @@ For the tests there is a slightly different setup required (with option `-D CMAK ...@@ -83,10 +90,10 @@ For the tests there is a slightly different setup required (with option `-D CMAK
    1. `mkdir build && cd build/` 1. `mkdir build && cd build/`
    2. `conan install .. -s "compiler.libcxx=libstdc++11"` 2. `conan install .. -s "compiler.libcxx=libstdc++11"`
    3. `cmake -B . -D CMAKE_BUILD_TYPE=Debug ..` 3. `cmake -B . -D CMAKE_BUILD_TYPE=Debug ..`
    * If your clang-format version is too old, formatting, linting etc. can be skipped: * If your clang-format version is too old, formatting, linting etc. can be skipped:
    `cmake -B . -D CMAKE_BUILD_TYPE=Debug -D SKIP_LINTING=ON ..` `cmake -B . -D CMAKE_BUILD_TYPE=Debug -D SKIP_LINTING=ON ..`
    * Depending on the clang version it might be necessary to also add * Depending on the clang version it might be necessary to also add
    `-DCMAKE_CXX_FLAGS="-Wno-unused-parameter"` `-DCMAKE_CXX_FLAGS="-Wno-unused-parameter"`
    5. `cmake --build .` 5. `cmake --build .`
    ### Run ### Run
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment