From 9efe4b1ea77eee61dce2285cb518ade57b3ccdd3 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Thu, 3 Nov 2022 13:07:14 -0700 Subject: [PATCH] (#13939) fmt: fix import location of `cmake_layout` for v2 * fmt: fix import location of `cmake_layout` for v2 * check cppstd since the default in v2 with apple-clang is too low --- recipes/fmt/all/conanfile.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes/fmt/all/conanfile.py b/recipes/fmt/all/conanfile.py index ede2e264b4b15..66516fa1027c3 100644 --- a/recipes/fmt/all/conanfile.py +++ b/recipes/fmt/all/conanfile.py @@ -1,9 +1,10 @@ import os from conan import ConanFile -from conan.tools.cmake import CMake, CMakeToolchain +from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir -from conan.tools.layout import basic_layout, cmake_layout +from conan.tools.layout import basic_layout +from conan.tools.build import check_min_cppstd from conan.tools.scm import Version required_conan_version = ">=1.52.0" @@ -87,6 +88,10 @@ def package_id(self): else: del self.info.options.with_fmt_alias + def validate(self): + if self.info.settings.get_safe("compiler.cppstd"): + check_min_cppstd(self, 11) + def source(self): get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True)