From c374d0ebd198cf64816e15703895c2c8b12bc753 Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Fri, 1 Jul 2022 02:29:20 +0200 Subject: [PATCH] BUILD: build caosdb with build_acm=True --- .docker/Dockerfile | 2 +- conanfile.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index a0d975f..141cce7 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -7,7 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh WORKDIR /libcaosdb/ RUN mkdir build WORKDIR /libcaosdb/build -RUN conan create .. -s "compiler.libcxx=libstdc++11" +RUN conan create -s "compiler.libcxx=libstdc++11" -o caosdb:build_acm=True .. "caosdb/$(conan inspect --raw version ..)" COPY . /caosdb-cppinttest WORKDIR /caosdb-cppinttest diff --git a/conanfile.txt b/conanfile.txt index 97af2de..6204fd1 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -6,3 +6,6 @@ gtest/1.11.0 [generators] cmake + +[options] +caosdb:build_acm=True -- GitLab