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

Merge branch 'dev' into f-files

parents 8eaa4281 e58611aa
Branches
Tags
1 merge request!11F files
Pipeline #12097 passed
Pipeline: caosdb-cppinttest

#12098

    ...@@ -48,10 +48,9 @@ as compiler. We use [cmake](https://cmake.org/download/) as build tool. ...@@ -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 and build the project. (You can open Tools/Command Line/Developer Command
    Prompt and execute `msbuild libcaosdb.sln /property:Configuration=Release`) Prompt and execute `msbuild libcaosdb.sln /property:Configuration=Release`)
    ### Creating a Local Conan Build ## ### Creating a Local Conan Package ##
    Building and installing libcaosdb with Conan is just a single command: Building and installing libcaosdb with Conan is just a single command: `make conan-install`
    `conan create . -s "compiler.libcxx=libstdc++11"`
    For MacOS, you probably should adjust the option as mentioned above. For MacOS, you probably should adjust the option as mentioned above.
    ...@@ -65,6 +64,10 @@ the `--build=missing` option: `conan install .. [ other options ...@@ -65,6 +64,10 @@ the `--build=missing` option: `conan install .. [ other options
    ] --build=missing`. This should download and compile the sources of the ] --build=missing`. This should download and compile the sources of the
    dependencies. 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 ## Unit Tests
    ### Build ### Build
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment