diff --git a/conanfile.py b/conanfile.py index 2579ccc..27b49bb 100644 --- a/conanfile.py +++ b/conanfile.py @@ -6,9 +6,7 @@ import os class Pkg(ConanFile): settings = "os", "compiler", "build_type", "arch" - generators = ( - "CMakeDeps" - ) + generators = "CMakeDeps" default_options = { "systemc/*:shared": "True", "boost/*:fPIC": "True", @@ -35,24 +33,29 @@ class Pkg(ConanFile): } def requirements(self): - self.requires("systemc/3.0.1") - self.requires("fmt/8.0.1") - self.requires("spdlog/1.9.2") - self.requires("boost/1.85.0") - self.requires("catch2/3.1.0") - self.requires("lz4/1.9.4") - self.requires("yaml-cpp/0.7.0") - self.requires("jsoncpp/1.9.5") + if self.settings.compiler.cppstd: + cppstd = str(self.settings.compiler.cppstd).replace("gnu", "") + if cppstd == "11" or cppstd == "14": + self.requires("systemc/2.3.4") + else: + self.requires("systemc/3.0.1") + else: + self.requires("systemc/2.3.4") + self.requires("spdlog/1.16.0") + self.requires("boost/1.89.0") + self.requires("lz4/1.10.0") + self.requires("yaml-cpp/0.8.0") + self.requires("jsoncpp/1.9.6") self.requires("zlib/1.3.1") + self.requires("catch2/3.1.0") def build_requirements(self): pass def layout(self): cmake_layout(self) - + def generate(self): tc = CMakeToolchain(self) tc.user_presets_path = False tc.generate() - \ No newline at end of file diff --git a/scc b/scc index 3f5d963..5bb49d8 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 3f5d963ae0f7e83a340674d44c3a8e5125d221ef +Subproject commit 5bb49d85a106dffd5353ba40506ac5474b828fe5