Apply proposed workaround for CMAKE_CXX_STANDARD

conan-io · Sep 6, 2024 · 4af8294 · 4af8294
1 parent 8f5288f
commit 4af8294
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/recipes/openjph/all/conanfile.py b/recipes/openjph/all/conanfile.py
@@ -73,6 +73,11 @@ def generate(self):
         tc.variables["OJPH_ENABLE_TIFF_SUPPORT"] = self.options.with_tiff
         tc.variables["OJPH_BUILD_STREAM_EXPAND"] = self.options.with_stream_expand_tool
         tc.variables["OJPH_DISABLE_SIMD"] = self.options.disable_simd
+
+        # Workaround for Conan 1 where the CXX standard version isn't set to a fallback to gnu98 happens
+        if not self.settings.get_safe("compiler.cppstd"):
+            tc.cache_variables["CMAKE_CXX_STANDARD"] = 14 if self.options.with_stream_expand_tool else 11
+
         tc.generate()
 
         deps = CMakeDeps(self)