Skip to content

Commit

Permalink
Updated Boost to 1.84.0, reverted to add support for older compilers (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
madduci committed Jan 26, 2024
1 parent 63fc3ba commit 5f3d4aa
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# openE57

## [master] - 2024-XX-XX

## Changed
- Updated Boost Libraries to 1.84.0

## [1.6.5] - 2024-01-24

## Changed
Expand Down
16 changes: 10 additions & 6 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
}

Expand Down Expand Up @@ -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")
Expand All @@ -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)
Expand Down Expand Up @@ -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")

0 comments on commit 5f3d4aa

Please sign in to comment.