diff --git a/recipes/foxglove-websocket/all/conandata.yml b/recipes/foxglove-websocket/all/conandata.yml index 30a26f91bb4d6..8f15ef7f494fb 100644 --- a/recipes/foxglove-websocket/all/conandata.yml +++ b/recipes/foxglove-websocket/all/conandata.yml @@ -1,4 +1,7 @@ sources: + 1.1.0: + url: https://github.com/foxglove/ws-protocol/archive/refs/tags/releases/cpp/v1.1.0.tar.gz + sha256: 3ad1f639e340e878dd638d542e57185b8c7c08fdfcb03d8c43d054957078a81f 1.0.0: url: https://github.com/foxglove/ws-protocol/archive/refs/tags/releases/cpp/v1.0.0.tar.gz sha256: c6106934a47d9d5b53ee3f6a0a6c8ec778ffdb52e9b462136bfc1bc5391ed227 diff --git a/recipes/foxglove-websocket/all/conanfile.py b/recipes/foxglove-websocket/all/conanfile.py index 60557d9c03f13..666816b0d5820 100644 --- a/recipes/foxglove-websocket/all/conanfile.py +++ b/recipes/foxglove-websocket/all/conanfile.py @@ -20,10 +20,12 @@ class FoxgloveWebSocketConan(ConanFile): options = { "shared": [True, False], "fPIC": [True, False], + "asio": ["boost", "standalone"], } default_options = { "shared": False, "fPIC": True, + "asio": "standalone" } settings = "os", "arch", "compiler", "build_type" @@ -65,13 +67,15 @@ def validate(self): def requirements(self): self.requires("nlohmann_json/3.10.5", transitive_headers=True) - self.requires("websocketpp/0.8.2") + self.requires("websocketpp/0.8.2", transitive_headers=True, transitive_libs=True) def layout(self): cmake_layout(self, src_folder="src") def generate(self): tc = CMakeToolchain(self) + if self.settings.os == "Windows" and self.options.shared: + tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = True tc.generate() def config_options(self): @@ -79,7 +83,7 @@ def config_options(self): del self.options.fPIC def configure(self): - self.options["websocketpp"].asio = "standalone" + self.options["websocketpp"].asio = self.options.asio if self.options.shared: self.options.rm_safe("fPIC") diff --git a/recipes/foxglove-websocket/config.yml b/recipes/foxglove-websocket/config.yml index 3e794e52e592a..29bb1651937f8 100644 --- a/recipes/foxglove-websocket/config.yml +++ b/recipes/foxglove-websocket/config.yml @@ -1,3 +1,5 @@ versions: + 1.1.0: + folder: all 1.0.0: folder: all