From 8f39ed42bd55a472a539d60cc7c7cccb453ceadc Mon Sep 17 00:00:00 2001 From: Gareth Sylvester-Bradley <31761158+garethsb@users.noreply.github.com> Date: Fri, 19 Aug 2022 06:28:58 +0100 Subject: [PATCH] (#12321) [boost] Fix #11988 * [boost] Fix #11988 * Use tools.scm.Version again (cherry picked from commit 586fa209951f61650a06c61022c05fb27e22f118) --- recipes/boost/all/conanfile.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/boost/all/conanfile.py b/recipes/boost/all/conanfile.py index 57e9f1776f251..d6558c4513b06 100644 --- a/recipes/boost/all/conanfile.py +++ b/recipes/boost/all/conanfile.py @@ -5,8 +5,7 @@ from conan import ConanFile from conan.errors import ConanException, ConanInvalidConfiguration from conans import tools -# TODO: Update to conan.tools.scm.Version after Conan 1.50.2 -from conans.tools import Version +from conan.tools.scm import Version import glob import os @@ -1429,7 +1428,7 @@ def package_info(self): if self.options.filesystem_no_deprecated: self.cpp_info.components["headers"].defines.append("BOOST_FILESYSTEM_NO_DEPRECATED") - if self.options.filesystem_version is not None: + if self.options.filesystem_version: self.cpp_info.components["headers"].defines.append(f"BOOST_FILESYSTEM_VERSION={self.options.filesystem_version}") if self.options.segmented_stacks: