diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index ee32a6f..cc294bb 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -41,7 +41,7 @@ jobs: - name: Build Docker image run: docker build -t osp-builder /tmp/osp-builder-docker/ - name: Build FMI Library - run: docker run --rm --env GITHUB_REF="$GITHUB_REF" -v $(pwd):/mnt/source osp-builder + run: docker run --rm --env GITHUB_REF="$GITHUB_REF" -v $(pwd):/mnt/source:rw osp-builder conan-on-windows: name: Conan diff --git a/conanfile.py b/conanfile.py index 599ad77..78ab8c0 100644 --- a/conanfile.py +++ b/conanfile.py @@ -27,9 +27,6 @@ def source(self): git.clone(url="https://github.com/modelon-community/fmi-library.git", target="src", args=["--branch=2.3"]) patch(self, base_path="src", patch_file="build-static-c99snprintf.patch") - def layout(self): - cmake_layout(self) - def generate(self): tc = CMakeToolchain(self) tc.cache_variables["FMILIB_BUILD_STATIC_LIB"] = not self.options.shared diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 27f9105..c0d56e2 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -17,9 +17,6 @@ def build(self): cmake = CMake(self) cmake.configure() cmake.build() - - def layout(self): - cmake_layout(self) def test(self): if can_run(self):