embag: revert to using a patch

Otherwise would need to add /Zc:__cplusplus to exported cxxflags.
conan-io · Aug 18, 2023 · 92f03bc · 92f03bc
1 parent b0e9656
commit 92f03bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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()