From 5f3d4aab2a3ca30f5abdac195ac9735c98b13ce4 Mon Sep 17 00:00:00 2001 From: Michele Adduci Date: Fri, 26 Jan 2024 13:21:07 +0100 Subject: [PATCH] Updated Boost to 1.84.0, reverted to add support for older compilers (#35) --- CHANGELOG.md | 5 +++++ conanfile.py | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0c7b52..9f062cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # openE57 +## [master] - 2024-XX-XX + +## Changed +- Updated Boost Libraries to 1.84.0 + ## [1.6.5] - 2024-01-24 ## Changed diff --git a/conanfile.py b/conanfile.py index e7b3d0a..1178b3b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -8,7 +8,8 @@ from conan.tools.microsoft import is_msvc, is_msvc_static_runtime from conan.tools.scm import Version -required_conan_version = ">=2.0.0" +required_conan_version = ">=1.54.0" + class Opene57Conan(ConanFile): name = "opene57" @@ -44,9 +45,10 @@ def _build_subfolder(self): @property def _minimum_compilers_version(self): return { - "msvc": "15", - "gcc": "8", - "clang": "8", + "Visual Studio": "15", + "msvc": "191", + "gcc": "7", + "clang": "6", "apple-clang": "10", } @@ -76,7 +78,7 @@ def validate(self): def requirements(self): if self.options.with_tools: - self.requires("boost/1.83.0") + self.requires("boost/1.84.0") if self.options.with_docs: self.requires("doxygen/1.9.4") @@ -92,8 +94,11 @@ def generate(self): tc.variables["BUILD_EXAMPLES"] = False tc.variables["BUILD_TOOLS"] = self.options.with_tools tc.variables["BUILD_TESTS"] = False + tc.variables["BUILD_DOCS"] = self.options.with_docs + if is_msvc(self): tc.variables["BUILD_WITH_MT"] = is_msvc_static_runtime(self) + tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = self.options.shared tc.generate() deps = CMakeDeps(self) @@ -124,4 +129,3 @@ def package_info(self): self.cpp_info.defines.append("XERCES_STATIC_LIBRARY") self.cpp_info.defines.append("CRCPP_INCLUDE_ESOTERIC_CRC_DEFINITIONS") self.cpp_info.defines.append("CRCPP_USE_CPP11") -