diff --git a/.docker/Dockerfile b/.docker/Dockerfile index a0d975f82b721dd71cc1e4f7e724c47c20e28a55..141cce711b7aba63cc1a393f5577e986f8542b17 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 97af2de0f1426a8c30f3b9e7eb74460c35224978..6204fd13a0469bd0f0721d236e410c90cdcbbb2a 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -6,3 +6,6 @@ gtest/1.11.0 [generators] cmake + +[options] +caosdb:build_acm=True