From 2270ca3c774aa9bdb8f004adcc1aa27861cab422 Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Mon, 15 May 2023 18:07:59 +0300
Subject: [PATCH 01/10] embag: add new recipe

---
 recipes/embag/all/CMakeLists.txt              | 31 +++++++
 recipes/embag/all/conandata.yml               |  4 +
 recipes/embag/all/conanfile.py                | 83 +++++++++++++++++++
 recipes/embag/all/test_package/CMakeLists.txt |  7 ++
 recipes/embag/all/test_package/conanfile.py   | 26 ++++++
 .../embag/all/test_package/test_package.cpp   | 18 ++++
 .../embag/all/test_v1_package/CMakeLists.txt  |  8 ++
 .../embag/all/test_v1_package/conanfile.py    | 19 +++++
 recipes/embag/config.yml                      |  3 +
 9 files changed, 199 insertions(+)
 create mode 100644 recipes/embag/all/CMakeLists.txt
 create mode 100644 recipes/embag/all/conandata.yml
 create mode 100644 recipes/embag/all/conanfile.py
 create mode 100644 recipes/embag/all/test_package/CMakeLists.txt
 create mode 100644 recipes/embag/all/test_package/conanfile.py
 create mode 100644 recipes/embag/all/test_package/test_package.cpp
 create mode 100644 recipes/embag/all/test_v1_package/CMakeLists.txt
 create mode 100644 recipes/embag/all/test_v1_package/conanfile.py
 create mode 100644 recipes/embag/config.yml

diff --git a/recipes/embag/all/CMakeLists.txt b/recipes/embag/all/CMakeLists.txt
new file mode 100644
index 0000000000000..d1d8412b04c8b
--- /dev/null
+++ b/recipes/embag/all/CMakeLists.txt
@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.15)
+project(embag LANGUAGES CXX)
+
+find_package(Boost REQUIRED COMPONENTS iostreams headers)
+find_package(lz4 REQUIRED CONFIG)
+find_package(BZip2 REQUIRED CONFIG)
+
+file(GLOB_RECURSE embag_SOURCES "lib/*.cc")
+add_library(embag ${embag_SOURCES})
+set_target_properties(embag PROPERTIES
+    # embag does not export any symbols otherwise
+    WINDOWS_EXPORT_ALL_SYMBOLS ON
+)
+target_link_libraries(embag PUBLIC
+    Boost::iostreams
+    Boost::headers
+    lz4::lz4
+    BZip2::BZip2
+)
+
+install(TARGETS embag
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/embag
+    FILES_MATCHING
+    PATTERN "*.h"
+    PATTERN "*.hpp"
+)
diff --git a/recipes/embag/all/conandata.yml b/recipes/embag/all/conandata.yml
new file mode 100644
index 0000000000000..6df20cbf9a5ef
--- /dev/null
+++ b/recipes/embag/all/conandata.yml
@@ -0,0 +1,4 @@
+sources:
+  "0.0.42":
+    url: "https://github.com/embarktrucks/embag/archive/refs/tags/0.0.42.tar.gz"
+    sha256: "60b22ba9355528040046b7e2c3ee968798ad5773a9eb7a1d13cf33dc47e2adec"
diff --git a/recipes/embag/all/conanfile.py b/recipes/embag/all/conanfile.py
new file mode 100644
index 0000000000000..8dc5b2ec7ca8b
--- /dev/null
+++ b/recipes/embag/all/conanfile.py
@@ -0,0 +1,83 @@
+import os
+
+from conan import ConanFile
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
+from conan.tools.files import (
+    get,
+    copy,
+    rm,
+)
+
+required_conan_version = ">=1.53.0"
+
+
+class EmbagConan(ConanFile):
+    name = "embag"
+    description = "Schema and dependency free ROS bag reader"
+    license = "MIT"
+    url = "https://github.com/conan-io/conan-center-index"
+    homepage = "https://github.com/embarktrucks/embag"
+    topics = ("rosbag", "ros", "robotics")
+    package_type = "library"
+    settings = "os", "arch", "compiler", "build_type"
+    options = {
+        "shared": [True, False],
+        "fPIC": [True, False],
+    }
+    default_options = {
+        "shared": False,
+        "fPIC": True,
+    }
+
+    def export_sources(self):
+        copy(
+            self,
+            "CMakeLists.txt",
+            src=self.recipe_folder,
+            dst=os.path.join(self.export_sources_folder, "src"),
+        )
+
+    def config_options(self):
+        if self.settings.os == "Windows":
+            del self.options.fPIC
+
+    def configure(self):
+        if self.options.shared:
+            self.options.rm_safe("fPIC")
+
+    def layout(self):
+        cmake_layout(self, src_folder="src")
+
+    def requirements(self):
+        self.requires("boost/1.81.0", transitive_headers=True, transitive_libs=True)
+        self.requires("lz4/1.9.4", transitive_headers=True, transitive_libs=True)
+        self.requires("bzip2/1.0.8", transitive_headers=True, transitive_libs=True)
+
+    def source(self):
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.generate()
+        deps = CMakeDeps(self)
+        deps.generate()
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def package(self):
+        copy(
+            self,
+            pattern="LICENSE",
+            dst=os.path.join(self.package_folder, "licenses"),
+            src=self.source_folder,
+        )
+        cmake = CMake(self)
+        cmake.install()
+
+        rm(self, "*.pdb", self.package_folder)
+
+    def package_info(self):
+        self.cpp_info.libs = ["embag"]
diff --git a/recipes/embag/all/test_package/CMakeLists.txt b/recipes/embag/all/test_package/CMakeLists.txt
new file mode 100644
index 0000000000000..3d3216c5c9b9a
--- /dev/null
+++ b/recipes/embag/all/test_package/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.15)
+project(test_package LANGUAGES CXX)
+
+find_package(embag REQUIRED CONFIG)
+
+add_executable(${PROJECT_NAME} test_package.cpp)
+target_link_libraries(${PROJECT_NAME} PRIVATE embag::embag)
diff --git a/recipes/embag/all/test_package/conanfile.py b/recipes/embag/all/test_package/conanfile.py
new file mode 100644
index 0000000000000..ef5d7042163ec
--- /dev/null
+++ b/recipes/embag/all/test_package/conanfile.py
@@ -0,0 +1,26 @@
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import cmake_layout, CMake
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def layout(self):
+        cmake_layout(self)
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if can_run(self):
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
+            self.run(bin_path, env="conanrun")
diff --git a/recipes/embag/all/test_package/test_package.cpp b/recipes/embag/all/test_package/test_package.cpp
new file mode 100644
index 0000000000000..c8563d402b2b7
--- /dev/null
+++ b/recipes/embag/all/test_package/test_package.cpp
@@ -0,0 +1,18 @@
+#include <cstdlib>
+#include <iostream>
+
+#include <embag/view.h>
+
+int main() {
+    Embag::View view{};
+    // Do not load any bag file for testing
+    // view.addBag("xyz.bag");
+    const auto start_time = view.getStartTime();
+    const auto end_time = view.getEndTime();
+    std::cout << "Start time is " << start_time.secs + start_time.nsecs * 1e-9 << std::endl;
+    std::cout << "End time is " << end_time.secs + end_time.nsecs * 1e-9 << std::endl;
+    for (const auto &message : view.getMessages()) {
+        message->print();
+    }
+    return EXIT_SUCCESS;
+}
diff --git a/recipes/embag/all/test_v1_package/CMakeLists.txt b/recipes/embag/all/test_v1_package/CMakeLists.txt
new file mode 100644
index 0000000000000..54d2c07bb9d41
--- /dev/null
+++ b/recipes/embag/all/test_v1_package/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.15)
+project(test_package LANGUAGES CXX)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup(TARGETS)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package/)
diff --git a/recipes/embag/all/test_v1_package/conanfile.py b/recipes/embag/all/test_v1_package/conanfile.py
new file mode 100644
index 0000000000000..c492184eec19c
--- /dev/null
+++ b/recipes/embag/all/test_v1_package/conanfile.py
@@ -0,0 +1,19 @@
+from conans import ConanFile, CMake
+from conan.tools.build import cross_building
+import os
+
+
+# legacy validation with Conan 1.x
+class TestPackageV1Conan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "cmake", "cmake_find_package_multi"
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if not cross_building(self):
+            bin_path = os.path.join("bin", "test_package")
+            self.run(bin_path, run_environment=True)
diff --git a/recipes/embag/config.yml b/recipes/embag/config.yml
new file mode 100644
index 0000000000000..97f7bce9d3b04
--- /dev/null
+++ b/recipes/embag/config.yml
@@ -0,0 +1,3 @@
+versions:
+  "0.0.42":
+    folder: all

From 0a283f15f42a8f9ca891e9d4fca18e62b558533d Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Mon, 15 May 2023 20:22:19 +0300
Subject: [PATCH 02/10] embag: set min cxx_standard to 11

---
 recipes/embag/all/CMakeLists.txt              |  1 +
 recipes/embag/all/conanfile.py                | 15 ++++++++++-----
 recipes/embag/all/test_package/CMakeLists.txt |  1 +
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/recipes/embag/all/CMakeLists.txt b/recipes/embag/all/CMakeLists.txt
index d1d8412b04c8b..d9e3e5a8ac7b8 100644
--- a/recipes/embag/all/CMakeLists.txt
+++ b/recipes/embag/all/CMakeLists.txt
@@ -11,6 +11,7 @@ set_target_properties(embag PROPERTIES
     # embag does not export any symbols otherwise
     WINDOWS_EXPORT_ALL_SYMBOLS ON
 )
+target_compile_features(embag PUBLIC cxx_std_11)
 target_link_libraries(embag PUBLIC
     Boost::iostreams
     Boost::headers
diff --git a/recipes/embag/all/conanfile.py b/recipes/embag/all/conanfile.py
index 8dc5b2ec7ca8b..dbc4ec183445f 100644
--- a/recipes/embag/all/conanfile.py
+++ b/recipes/embag/all/conanfile.py
@@ -1,12 +1,9 @@
 import os
 
 from conan import ConanFile
+from conan.tools.build import check_min_cppstd
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import (
-    get,
-    copy,
-    rm,
-)
+from conan.tools.files import get, copy, rm
 
 required_conan_version = ">=1.53.0"
 
@@ -29,6 +26,10 @@ class EmbagConan(ConanFile):
         "fPIC": True,
     }
 
+    @property
+    def _min_cppstd(self):
+        return 11
+
     def export_sources(self):
         copy(
             self,
@@ -53,6 +54,10 @@ def requirements(self):
         self.requires("lz4/1.9.4", transitive_headers=True, transitive_libs=True)
         self.requires("bzip2/1.0.8", transitive_headers=True, transitive_libs=True)
 
+    def validate(self):
+        if self.settings.compiler.cppstd:
+            check_min_cppstd(self, self._min_cppstd)
+
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
diff --git a/recipes/embag/all/test_package/CMakeLists.txt b/recipes/embag/all/test_package/CMakeLists.txt
index 3d3216c5c9b9a..59057f2c3e5f5 100644
--- a/recipes/embag/all/test_package/CMakeLists.txt
+++ b/recipes/embag/all/test_package/CMakeLists.txt
@@ -5,3 +5,4 @@ find_package(embag REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
 target_link_libraries(${PROJECT_NAME} PRIVATE embag::embag)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)

From 121993f879d452e88f98cd2adee449a2ed4f1fad Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Mon, 15 May 2023 22:34:08 +0300
Subject: [PATCH 03/10] embag: add missing 'm' system lib

---
 recipes/embag/all/conanfile.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes/embag/all/conanfile.py b/recipes/embag/all/conanfile.py
index dbc4ec183445f..f9bb30912b0dc 100644
--- a/recipes/embag/all/conanfile.py
+++ b/recipes/embag/all/conanfile.py
@@ -86,3 +86,6 @@ def package(self):
 
     def package_info(self):
         self.cpp_info.libs = ["embag"]
+
+        if self.settings.os in ["Linux", "FreeBSD"]:
+            self.cpp_info.system_libs.append("m")

From f632c6057754b86056ebe9625ee3656b3c388183 Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Mon, 15 May 2023 22:34:33 +0300
Subject: [PATCH 04/10] embag: bump min c++ std to 14

---
 recipes/embag/all/CMakeLists.txt              | 2 +-
 recipes/embag/all/conanfile.py                | 2 +-
 recipes/embag/all/test_package/CMakeLists.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/embag/all/CMakeLists.txt b/recipes/embag/all/CMakeLists.txt
index d9e3e5a8ac7b8..3ad04aeb9f189 100644
--- a/recipes/embag/all/CMakeLists.txt
+++ b/recipes/embag/all/CMakeLists.txt
@@ -11,7 +11,7 @@ set_target_properties(embag PROPERTIES
     # embag does not export any symbols otherwise
     WINDOWS_EXPORT_ALL_SYMBOLS ON
 )
-target_compile_features(embag PUBLIC cxx_std_11)
+target_compile_features(embag PUBLIC cxx_std_14)
 target_link_libraries(embag PUBLIC
     Boost::iostreams
     Boost::headers
diff --git a/recipes/embag/all/conanfile.py b/recipes/embag/all/conanfile.py
index f9bb30912b0dc..4b4d12f786ead 100644
--- a/recipes/embag/all/conanfile.py
+++ b/recipes/embag/all/conanfile.py
@@ -28,7 +28,7 @@ class EmbagConan(ConanFile):
 
     @property
     def _min_cppstd(self):
-        return 11
+        return 14
 
     def export_sources(self):
         copy(
diff --git a/recipes/embag/all/test_package/CMakeLists.txt b/recipes/embag/all/test_package/CMakeLists.txt
index 59057f2c3e5f5..27b09cd59a901 100644
--- a/recipes/embag/all/test_package/CMakeLists.txt
+++ b/recipes/embag/all/test_package/CMakeLists.txt
@@ -5,4 +5,4 @@ find_package(embag REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
 target_link_libraries(${PROJECT_NAME} PRIVATE embag::embag)
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)

From ec400a6eb2787470dd70fdb66f706d55b6b30786 Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Mon, 15 May 2023 23:23:24 +0300
Subject: [PATCH 05/10] embag: fix a portability bug

---
 recipes/embag/all/conanfile.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/recipes/embag/all/conanfile.py b/recipes/embag/all/conanfile.py
index 4b4d12f786ead..97c6272a3280e 100644
--- a/recipes/embag/all/conanfile.py
+++ b/recipes/embag/all/conanfile.py
@@ -3,7 +3,7 @@
 from conan import ConanFile
 from conan.tools.build import check_min_cppstd
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import get, copy, rm
+from conan.tools.files import get, copy, rm, replace_in_file
 
 required_conan_version = ">=1.53.0"
 
@@ -67,7 +67,17 @@ def generate(self):
         deps = CMakeDeps(self)
         deps.generate()
 
+    def _patch_sources(self):
+        # Disable a C++11 workaround that is broken on MSVC
+        replace_in_file(
+            self,
+            os.path.join(self.source_folder, "lib", "util.h"),
+            "#if __cplusplus < 201402L",
+            "#if false",
+        )
+
     def build(self):
+        self._patch_sources()
         cmake = CMake(self)
         cmake.configure()
         cmake.build()

From 8662c40f00a2b9e9a9f432cf9a1eed418e9fa327 Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Thu, 25 May 2023 13:29:26 +0300
Subject: [PATCH 06/10] embag: drop test_v1_package

---
 .../embag/all/test_v1_package/CMakeLists.txt  |  8 --------
 .../embag/all/test_v1_package/conanfile.py    | 19 -------------------
 2 files changed, 27 deletions(-)
 delete mode 100644 recipes/embag/all/test_v1_package/CMakeLists.txt
 delete mode 100644 recipes/embag/all/test_v1_package/conanfile.py

diff --git a/recipes/embag/all/test_v1_package/CMakeLists.txt b/recipes/embag/all/test_v1_package/CMakeLists.txt
deleted file mode 100644
index 54d2c07bb9d41..0000000000000
--- a/recipes/embag/all/test_v1_package/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-project(test_package LANGUAGES CXX)
-
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
-
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/
-                 ${CMAKE_CURRENT_BINARY_DIR}/test_package/)
diff --git a/recipes/embag/all/test_v1_package/conanfile.py b/recipes/embag/all/test_v1_package/conanfile.py
deleted file mode 100644
index c492184eec19c..0000000000000
--- a/recipes/embag/all/test_v1_package/conanfile.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from conans import ConanFile, CMake
-from conan.tools.build import cross_building
-import os
-
-
-# legacy validation with Conan 1.x
-class TestPackageV1Conan(ConanFile):
-    settings = "os", "arch", "compiler", "build_type"
-    generators = "cmake", "cmake_find_package_multi"
-
-    def build(self):
-        cmake = CMake(self)
-        cmake.configure()
-        cmake.build()
-
-    def test(self):
-        if not cross_building(self):
-            bin_path = os.path.join("bin", "test_package")
-            self.run(bin_path, run_environment=True)

From bed83ccdda20caa57e85a78404ec9f1e836532c4 Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Thu, 25 May 2023 16:42:19 +0300
Subject: [PATCH 07/10] embag: transitive_libs not required for boost

---
 recipes/embag/all/conanfile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/embag/all/conanfile.py b/recipes/embag/all/conanfile.py
index 97c6272a3280e..1daf83822ba56 100644
--- a/recipes/embag/all/conanfile.py
+++ b/recipes/embag/all/conanfile.py
@@ -50,7 +50,7 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("boost/1.81.0", transitive_headers=True, transitive_libs=True)
+        self.requires("boost/1.81.0", transitive_headers=True)
         self.requires("lz4/1.9.4", transitive_headers=True, transitive_libs=True)
         self.requires("bzip2/1.0.8", transitive_headers=True, transitive_libs=True)
 

From b0e9656cb1038f2b40ea2c1e283916eda440709c Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Fri, 18 Aug 2023 13:05:27 +0300
Subject: [PATCH 08/10] embag: get rid of patch, add review suggestion

---
 recipes/embag/all/CMakeLists.txt | 11 +++++----
 recipes/embag/all/conanfile.py   | 40 +++++++++++---------------------
 2 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/recipes/embag/all/CMakeLists.txt b/recipes/embag/all/CMakeLists.txt
index 3ad04aeb9f189..6638694bdd2b6 100644
--- a/recipes/embag/all/CMakeLists.txt
+++ b/recipes/embag/all/CMakeLists.txt
@@ -19,11 +19,12 @@ target_link_libraries(embag PUBLIC
     BZip2::BZip2
 )
 
-install(TARGETS embag
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
+if (MSVC)
+    # For a #if __cplusplus < 201402L check in lib/util.h
+    target_compile_options(embag PRIVATE /Zc:__cplusplus)
+endif()
+
+install(TARGETS embag)
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/embag
     FILES_MATCHING
diff --git a/recipes/embag/all/conanfile.py b/recipes/embag/all/conanfile.py
index 1daf83822ba56..843797ac73db8 100644
--- a/recipes/embag/all/conanfile.py
+++ b/recipes/embag/all/conanfile.py
@@ -31,12 +31,9 @@ def _min_cppstd(self):
         return 14
 
     def export_sources(self):
-        copy(
-            self,
-            "CMakeLists.txt",
+        copy(self, "CMakeLists.txt",
             src=self.recipe_folder,
-            dst=os.path.join(self.export_sources_folder, "src"),
-        )
+            dst=os.path.join(self.export_sources_folder, "src"))
 
     def config_options(self):
         if self.settings.os == "Windows":
@@ -50,9 +47,12 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("boost/1.81.0", transitive_headers=True)
-        self.requires("lz4/1.9.4", transitive_headers=True, transitive_libs=True)
-        self.requires("bzip2/1.0.8", transitive_headers=True, transitive_libs=True)
+        # INFO: embag.h includes boost/variant.hpp
+        self.requires("boost/1.82.0", transitive_headers=True)
+        # INFO: decompression.h includes lz4frame.h
+        self.requires("lz4/1.9.4", transitive_headers=True)
+        # INFO: ros_bag_types.h includes bzlib.h
+        self.requires("bzip2/1.0.8", transitive_headers=True)
 
     def validate(self):
         if self.settings.compiler.cppstd:
@@ -67,35 +67,21 @@ def generate(self):
         deps = CMakeDeps(self)
         deps.generate()
 
-    def _patch_sources(self):
-        # Disable a C++11 workaround that is broken on MSVC
-        replace_in_file(
-            self,
-            os.path.join(self.source_folder, "lib", "util.h"),
-            "#if __cplusplus < 201402L",
-            "#if false",
-        )
-
     def build(self):
-        self._patch_sources()
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def package(self):
-        copy(
-            self,
-            pattern="LICENSE",
-            dst=os.path.join(self.package_folder, "licenses"),
-            src=self.source_folder,
-        )
+        copy(self, "LICENSE",
+             dst=os.path.join(self.package_folder, "licenses"),
+             src=self.source_folder)
         cmake = CMake(self)
         cmake.install()
-
-        rm(self, "*.pdb", self.package_folder)
+        rm(self, "*.pdb", self.package_folder, recursive=True)
 
     def package_info(self):
         self.cpp_info.libs = ["embag"]
 
         if self.settings.os in ["Linux", "FreeBSD"]:
-            self.cpp_info.system_libs.append("m")
+            self.cpp_info.system_libs = ["m"]

From 92f03bc5c70ca37ae8f8d8ebfc797e8b407c2be3 Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Fri, 18 Aug 2023 16:55:55 +0300
Subject: [PATCH 09/10] embag: revert to using a patch

Otherwise would need to add /Zc:__cplusplus to exported cxxflags.
---
 recipes/embag/all/CMakeLists.txt | 5 -----
 recipes/embag/all/conanfile.py   | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/recipes/embag/all/CMakeLists.txt b/recipes/embag/all/CMakeLists.txt
index 6638694bdd2b6..1f9b3ed4a4278 100644
--- a/recipes/embag/all/CMakeLists.txt
+++ b/recipes/embag/all/CMakeLists.txt
@@ -19,11 +19,6 @@ target_link_libraries(embag PUBLIC
     BZip2::BZip2
 )
 
-if (MSVC)
-    # For a #if __cplusplus < 201402L check in lib/util.h
-    target_compile_options(embag PRIVATE /Zc:__cplusplus)
-endif()
-
 install(TARGETS embag)
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/embag
diff --git a/recipes/embag/all/conanfile.py b/recipes/embag/all/conanfile.py
index 843797ac73db8..fa9122cd145e6 100644
--- a/recipes/embag/all/conanfile.py
+++ b/recipes/embag/all/conanfile.py
@@ -67,7 +67,13 @@ def generate(self):
         deps = CMakeDeps(self)
         deps.generate()
 
+    def _patch_sources(self):
+        # Disable a C++11 workaround that is broken on MSVC
+        replace_in_file(self, os.path.join(self.source_folder, "lib", "util.h"),
+                        "#if __cplusplus < 201402L", "#if false")
+
     def build(self):
+        self._patch_sources()
         cmake = CMake(self)
         cmake.configure()
         cmake.build()

From 6b6f8ff382ed9af01fddc9e5ba78165971ae6efa Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Fri, 1 Sep 2023 14:58:56 +0300
Subject: [PATCH 10/10] embag: get rid of the patch

---
 recipes/embag/all/CMakeLists.txt |  5 +++++
 recipes/embag/all/conanfile.py   | 16 +++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/recipes/embag/all/CMakeLists.txt b/recipes/embag/all/CMakeLists.txt
index 1f9b3ed4a4278..6638694bdd2b6 100644
--- a/recipes/embag/all/CMakeLists.txt
+++ b/recipes/embag/all/CMakeLists.txt
@@ -19,6 +19,11 @@ target_link_libraries(embag PUBLIC
     BZip2::BZip2
 )
 
+if (MSVC)
+    # For a #if __cplusplus < 201402L check in lib/util.h
+    target_compile_options(embag PRIVATE /Zc:__cplusplus)
+endif()
+
 install(TARGETS embag)
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/embag
diff --git a/recipes/embag/all/conanfile.py b/recipes/embag/all/conanfile.py
index fa9122cd145e6..3d3e19b6eb19b 100644
--- a/recipes/embag/all/conanfile.py
+++ b/recipes/embag/all/conanfile.py
@@ -3,7 +3,8 @@
 from conan import ConanFile
 from conan.tools.build import check_min_cppstd
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import get, copy, rm, replace_in_file
+from conan.tools.files import get, copy, rm
+from conan.tools.microsoft import is_msvc
 
 required_conan_version = ">=1.53.0"
 
@@ -32,8 +33,8 @@ def _min_cppstd(self):
 
     def export_sources(self):
         copy(self, "CMakeLists.txt",
-            src=self.recipe_folder,
-            dst=os.path.join(self.export_sources_folder, "src"))
+             src=self.recipe_folder,
+             dst=os.path.join(self.export_sources_folder, "src"))
 
     def config_options(self):
         if self.settings.os == "Windows":
@@ -67,13 +68,7 @@ def generate(self):
         deps = CMakeDeps(self)
         deps.generate()
 
-    def _patch_sources(self):
-        # Disable a C++11 workaround that is broken on MSVC
-        replace_in_file(self, os.path.join(self.source_folder, "lib", "util.h"),
-                        "#if __cplusplus < 201402L", "#if false")
-
     def build(self):
-        self._patch_sources()
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
@@ -91,3 +86,6 @@ def package_info(self):
 
         if self.settings.os in ["Linux", "FreeBSD"]:
             self.cpp_info.system_libs = ["m"]
+        if is_msvc(self):
+            # For a #if __cplusplus < 201402L check in lib/util.h, which is a public header
+            self.cpp_info.cxxflags.append("/Zc:__cplusplus")