From c683050182939d60861a283ef43bc8b5d167f88f Mon Sep 17 00:00:00 2001
From: Reinhard Biegel <reinhard.biegel@in-tech.com>
Date: Thu, 30 Mar 2023 09:43:26 +0200
Subject: [PATCH] Fix OSI conan recipe subdirectory handling
---
utils/ci/conan/recipe/osi/conanfile.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/utils/ci/conan/recipe/osi/conanfile.py b/utils/ci/conan/recipe/osi/conanfile.py
index ece522d49..ab1d4756f 100644
--- a/utils/ci/conan/recipe/osi/conanfile.py
+++ b/utils/ci/conan/recipe/osi/conanfile.py
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2021-2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+# Copyright (c) 2021-2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# 2021 ITK Engineering GmbH
#
# This program and the accompanying materials are made available under the
@@ -36,14 +36,13 @@ class OsiConan(ConanFile):
raise errors.ConanInvalidConfiguration("WORKSPACE environment variable has to be set")
def source(self):
- git = tools.Git(folder="osi3")
+ git = tools.Git()
git.clone("https://github.com/OpenSimulationInterface/open-simulation-interface.git", "v3.5.0", "--recursive")
- self.run("find . -maxdepth 1 -name '*.proto' -exec sed -i '2i option cc_enable_arenas = true;' {} \;", win_bash=True, cwd="osi3")
+ self.run("find . -maxdepth 1 -name '*.proto' -exec sed -i '2i option cc_enable_arenas = true;' {} \;", win_bash=True)
def build(self):
cmake = CMake(self)
- cmake.configure(source_folder="osi3",
- defs={
+ cmake.configure(defs={
"CMAKE_INSTALL_PREFIX": "./temp-deploy",
"CMAKE_PREFIX_PATH": f"{environ.get('WORKSPACE')}/deps/protobuf-shared"
})
--
GitLab