vtd: Migrate osi-sensor package to Conan 2.0 compatibility

Author: cassava

optional/vtd/Makefile

@@ -17,7 +17,7 @@ UNSELECT_VENDOR := ${WITHOUT_VENDOR}
 WITH_VENDOR :=
 SELECT_VENDOR := $(call uniq, $(filter-out ${UNSELECT_VENDOR}, ${ALL_VENDOR}) ${WITH_VENDOR})
 
-vendor/osi-sensor-1.0.0-vtd2.2: vendor/vtd-2.2.0 vendor/open-simulation-interface-3.0.1
+vendor/osi-sensor-1.0.0: vendor/vtd-2.2.0 vendor/open-simulation-interface-3.0.1
 vendor/open-simulation-interface-3.0.1: vendor/protobuf-2.6.1
 vendor/open-simulation-interface-3.2.0: vendor/protobuf-2.6.1
 

optional/vtd/tests/conanfile_with_vtd-2.2.0.py

@@ -43,7 +43,7 @@ def requirements(self):
         self.requires("incbin/cci.20211107", override=True)
 
         # Runtime requirements for VTD.
-        self.requires("osi-sensor/1.0.0-vtd2.2@cloe/stable")
+        self.requires("osi-sensor/1.0.0@cloe/stable")
         self.requires("vtd/2.2.0@cloe-restricted/stable")
 
         # Overrides:

optional/vtd/vendor/osi-sensor-1.0.0-vtd2.2/conanfile.py

@@ -1,24 +1,29 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
-project(OSMPDummySensor
-    LANGUAGES CXX
-)
+project(OSMPDummySensor LANGUAGES CXX)
 
-include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-# Compiler definitions
-string(TIMESTAMP FMUTIMESTAMP UTC)
-string(MD5 FMUGUID modelDescription.in.xml)
-configure_file(modelDescription.in.xml modelDescription.xml @ONLY)
+# Input Variables
+set(VTD_ROOT "" CACHE STRING "Path to VTD root directory")
+
+# Dependencies
+find_package(open_simulation_interface REQUIRED)
+find_package(protobuf CONFIG REQUIRED)
 find_library(VTD_OSI_LIBRARY NAME libopen_simulation_interface.so
-    PATHS "${CONAN_VTD_ROOT}/Data/Setups/Standard.OSI3/Bin/"
+    PATHS "${VTD_ROOT}/Data/Setups/Standard.OSI3/Bin/"
     NO_DEFAULT_PATH
 )
 if(NOT VTD_OSI_LIBRARY)
-    message(WARNING "VTD OSI library not found. Using Conan package..")
-    set(VTD_OSI_LIBRARY CONAN_PKG::open-simulation-interface)
+    message(WARNING "VTD OSI library not found. Using external package.")
+    set(VTD_OSI_LIBRARY open_simulation_interface::libopen_simulation_interface)
 endif()
+
+# Configuration
+string(TIMESTAMP FMUTIMESTAMP UTC)
+string(MD5 FMUGUID modelDescription.in.xml)
+configure_file(modelDescription.in.xml modelDescription.xml @ONLY)
+
 # Library ------------------------------------------------------------
 add_library(${PROJECT_NAME} SHARED
     OSMPDummySensor.cpp
@@ -28,14 +33,17 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
     CXX_STANDARD_REQUIRED ON
     PREFIX ""
 )
+message(STATUS "protobuf_FOUND: ${protobuf_FOUND}")
+message(STATUS "protobuf_INCLUDE_DIRS: ${protobuf_INCLUDE_DIRS}")
 target_include_directories(${PROJECT_NAME}
     PUBLIC
         ../includes
-        $<BUILD_INTERFACE:${CONAN_INCLUDE_DIRS_PROTOBUF}>
-        $<BUILD_INTERFACE:${CONAN_INCLUDE_DIRS_OPEN-SIMULATION-INTERFACE}>
+        ${open_simulation_interface_INCLUDE_DIRS}
+        ${protobuf_INCLUDE_DIR}
 )
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
+        protobuf::libprotobuf
         ${VTD_OSI_LIBRARY}
 )
 target_compile_definitions(${PROJECT_NAME}

optional/vtd/vendor/osi-sensor-1.0.0-vtd2.2/CMakeLists.txt renamed to optional/vtd/vendor/osi-sensor-1.0.0/CMakeLists.txt

@@ -0,0 +1,10 @@
+---
+sources:
+  "1.0.0":
+    url: "https://github.com/OpenSimulationInterface/osi-sensor-model-packaging/archive/refs/tags/v1.0.0.tar.gz"
+    sha256: "6c9617608e815419f5c9b7b3359a0573082e7068dfcfc0f42c059c8094265fd6"
+patches:
+  "1.0.0":
+    - patch_file: "patches/fix-osi-includes.patch"
+    - patch_file: "patches/osmp_vtd_v2.2.patch"
+    - patch_file: "patches/cmakelists.patch"

optional/vtd/vendor/osi-sensor-1.0.0-vtd2.2/Makefile renamed to optional/vtd/vendor/osi-sensor-1.0.0/Makefile

@@ -0,0 +1,94 @@
+# mypy: ignore-errors
+# pylint: skip-file
+
+import os
+import shutil
+from pathlib import Path
+
+from conan import ConanFile
+from conan.tools import cmake, files
+
+required_conan_version = ">=1.52.0"
+
+
+class VtdSensorConan(ConanFile):
+    name = "osi-sensor"
+    version = "1.0.0"
+    license = "Mozilla Public License 2.0"
+    url = "https://github.com/OpenSimulationInterface/osi-sensor-model-packaging"
+    description = "Example of a sensor model using OSI with FMI 2.0."
+    topics = ("Sensor Simulation", "HAD")
+    settings = "os", "compiler", "build_type", "arch"
+    generators = "CMakeDeps", "VirtualRunEnv"
+    options = {
+        "simulator": ["vtd-2.2.0"],
+    }
+    default_options = {
+        "simulator": "vtd-2.2.0",
+    }
+
+    def export_sources(self):
+        files.export_conandata_patches(self)
+
+    def requirements(self):
+        self.requires("open-simulation-interface/3.0.1@cloe/stable", private=True)
+        self.requires(
+            "protobuf/2.6.1@cloe/stable",
+            transitive_headers=True,
+            transitive_libs=True,
+            private=True,
+        )
+        self.requires("vtd/2.2.0@cloe-restricted/stable")
+
+    def source(self):
+        files.get(
+            self,
+            **self.conan_data["sources"][self.version],
+            destination=".",
+            strip_root=True,
+        )
+
+    def configure(self):
+        # requirement options
+        self.options["open-simulation-interface"].shared = True
+        # package options
+        self.settings.compiler.cppstd = "11"
+        self.settings.compiler.libcxx = "libstdc++"
+
+    def layout(self):
+        cmake.cmake_layout(self)
+
+    def generate(self):
+        tc = cmake.CMakeToolchain(self)
+        tc.cache_variables["VTD_ROOT"] = self.deps_env_info["vtd"].VTD_ROOT
+        tc.generate()
+
+    def build(self):
+        vtd_root = Path(self.deps_env_info["vtd"].VTD_ROOT)
+        osi_lib = (
+            vtd_root / "/Data/Setups/Standard.OSI3/Bin/libopen_simulation_interface.so"
+        )
+        if not osi_lib.is_file():
+            self.output.warn(f"VTD OSI library not found: {osi_lib}")
+
+        cm = cmake.CMake(self)
+        if self.should_configure:
+            files.apply_conandata_patches(self)
+            cm.configure(
+                build_script_folder=os.path.join(
+                    self.source_folder, "examples", "OSMPDummySensor"
+                )
+            )
+        if self.should_build:
+            cm.build()
+
+    def package(self):
+        cm = cmake.CMake(self)
+        if self.should_install:
+            cm.install()
+
+    def package_info(self):
+        self.runenv_info.append(
+            "VTD_EXTERNAL_MODELS",
+            os.path.join(self.package_folder, "lib", "OSMPDummySensor.so"),
+        )