tooling: Add boost override if engine server enabled

Author: cassava

conanfile.py

@@ -23,6 +23,8 @@ class Cloe(ConanFile):
 
         "test": True,
         "pedantic": True,
+
+        "cloe-engine:server": True,
     }
     generators = "cmake"
     no_copy_source = True
@@ -38,30 +40,33 @@ def set_version(self):
             self.version = git.run("describe --dirty=-dirty")[1:]
 
     def requirements(self):
-        self.requires("boost/[~=1.69]", override=True)
-        self.requires("fmt/[~=8.1.1]", override=True)
-        self.requires("inja/[~=3.3.0]", override=True)
-        self.requires("nlohmann_json/[~=3.10.5]", override=True)
-        self.requires("incbin/[~=0.88.0]@cloe/stable", override=True),
-        requires = [
-            "cloe-runtime",
-            "cloe-models",
-            "cloe-plugin-basic",
-            "cloe-plugin-gndtruth-extractor",
-            "cloe-plugin-minimator",
-            "cloe-plugin-mocks",
-            "cloe-plugin-noisy-sensor",
-            "cloe-plugin-speedometer",
-            "cloe-plugin-virtue",
-        ]
+        def cloe_requires(dep):
+            self.requires(f"{dep}/{self.version}@cloe/develop")
+
+        cloe_requires("cloe-runtime")
+        cloe_requires("cloe-models")
+        cloe_requires("cloe-plugin-basic")
+        cloe_requires("cloe-plugin-gndtruth-extractor")
+        cloe_requires("cloe-plugin-minimator")
+        cloe_requires("cloe-plugin-mocks")
+        cloe_requires("cloe-plugin-noisy-sensor")
+        cloe_requires("cloe-plugin-speedometer")
+        cloe_requires("cloe-plugin-virtue")
         if self.options.with_vtd:
-            requires.append("cloe-plugin-vtd")
+            cloe_requires("cloe-plugin-vtd")
 
+        boost_version = "[>=1.65.0]"
         if self.options.with_engine:
-            requires.append("cloe-engine")
+            cloe_requires("cloe-engine")
+            if self.options["cloe-engine"].server:
+                boost_version = "[<1.70]"
 
-        for dep in requires:
-            self.requires(f"{dep}/{self.version}@cloe/develop")
+        # Overrides:
+        self.requires("fmt/[~=8.1.1]", override=True)
+        self.requires("inja/[~=3.3.0]", override=True)
+        self.requires("nlohmann_json/[~=3.10.5]", override=True)
+        self.requires("incbin/[~=0.88.0]@cloe/stable", override=True),
+        self.requires(f"boost/{boost_version}", override=True)
 
     def _configure_cmake(self):
         if self._cmake:

engine/tests/profile_with_server.py

@@ -27,4 +27,4 @@ def requirements(self):
         self.requires(f"cloe-plugin-speedometer/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-virtue/{self.version}@cloe/develop")
 
-        self.requires("boost/[~=1.69]", override=True)
+        self.requires("boost/[<1.70]", override=True)

plugins/minimator/tests/profile_default.py

@@ -29,3 +29,6 @@ def requirements(self):
         self.requires(f"cloe-plugin-noisy-sensor/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-speedometer/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-virtue/{self.version}@cloe/develop")
+
+        if self.options["cloe-engine"].server:
+            self.requires("boost/[<1.70]", override=True)

plugins/virtue/tests/profile_default.py

@@ -29,3 +29,6 @@ def requirements(self):
         self.requires(f"cloe-plugin-noisy-sensor/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-speedometer/{self.version}@cloe/develop")
         self.requires(f"cloe-plugin-virtue/{self.version}@cloe/develop")
+
+        if self.options["cloe-engine"].server:
+            self.requires("boost/[<1.70]", override=True)

plugins/vtd/tests/profile_default.py

@@ -6,6 +6,10 @@ class CloeTest(ConanFile):
     python_requires = "cloe-launch-profile/[~=0.19.0]@cloe/develop"
     python_requires_extend = "cloe-launch-profile.Base"
 
+    default_options = {
+        "cloe-engine:server": True,
+    }
+
     @property
     def cloe_launch_env(self):
         return {
@@ -29,3 +33,6 @@ def requirements(self):
         # Runtime requirements for VTD.
         self.requires("osi-sensor/1.0.0-vtd2.2@cloe/stable")
         self.requires("vtd/2.2.0@cloe-restricted/stable")
+
+        if self.options["cloe-engine"].server:
+            self.requires("boost/[<1.70]", override=True)