Skip to content

Commit

Permalink
CR: check and use cppstd setting if set
Browse files Browse the repository at this point in the history
  • Loading branch information
steinerthomas authored Sep 2, 2024
1 parent ec4e090 commit 5db13db
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion recipes/opentelemetry-cpp/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ def _min_cppstd(self):
@property
def _default_cppstd(self):
if self.options.with_stl == "default":
return default_cppstd(self).replace("gnu", "")
if self.settings.compiler.cppstd:
return str(self.settings.compiler.cppstd).replace("gnu", "")
else:
return default_cppstd(self).replace("gnu", "")
return self._min_cppstd

@property
Expand Down

0 comments on commit 5db13db

Please sign in to comment.