diff --git a/.project b/.project index 781e2b6..e7ad514 100644 --- a/.project +++ b/.project @@ -28,5 +28,6 @@ org.eclipse.cdt.core.ccnature org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.python.pydev.pythonNature diff --git a/conanfile.py b/conanfile.py new file mode 100644 index 0000000..d187926 --- /dev/null +++ b/conanfile.py @@ -0,0 +1,64 @@ +from conan import ConanFile +from conan.tools.cmake import cmake_layout +from conan.tools.cmake.toolchain.toolchain import CMakeToolchain +import os + + +class Pkg(ConanFile): + settings = "os", "compiler", "build_type", "arch" + generators = ( + "CMakeDeps" + ) + default_options = { + "llvm-core/*:targets": "X86", + "boost/*:fPIC": "True", + "boost/*:header_only": "False", + "boost/*:without_contract": "True", + "boost/*:without_fiber": "True", + "boost/*:without_graph": "True", + "boost/*:without_graph_parallel": "True", + "boost/*:without_iostreams": "True", + "boost/*:without_json": "True", + "boost/*:without_locale": "True", + "boost/*:without_log": "True", + "boost/*:without_math": "True", + "boost/*:without_mpi": "True", + "boost/*:without_nowide": "True", + "boost/*:without_python": "True", + "boost/*:without_random": "True", + "boost/*:without_regex": "True", + "boost/*:without_stacktrace": "True", + "boost/*:without_test": "True", + "boost/*:without_timer": "True", + "boost/*:without_type_erasure": "True", + "boost/*:without_wave": "True", + "systemc/*:shared": "True" + } + + def requirements(self): + self.requires("systemc/2.3.4") + 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.3") + self.requires("yaml-cpp/0.7.0") + self.requires("jsoncpp/1.9.5") + self.requires("zlib/1.2.12") + self.requires("rapidjson/cci.20230929") + if "WITH_LLVM" in os.environ: + self.requires("llvm-core/19.1.7") + if os.path.isdir("tgc-iss/dbt-rise-plugins"): + self.requires("lua/5.4.3") + + 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/conanfile.txt b/conanfile.txt deleted file mode 100644 index 80c687f..0000000 --- a/conanfile.txt +++ /dev/null @@ -1,44 +0,0 @@ -[requires] -jsoncpp/1.9.5 -yaml-cpp/0.6.3 -spdlog/1.9.2 -fmt/8.0.1 -boost/1.85.0 -gsl-lite/0.37.0 -systemc/2.3.4 -catch2/3.1.0 -zlib/1.2.11 -lz4/1.9.4 -rapidjson/cci.20230929 - -[options] -boost/*:fPIC=True -boost/*:header_only=False -boost/*:without_contract=True -boost/*:without_fiber=True -boost/*:without_graph=True -boost/*:without_graph_parallel=True -boost/*:without_iostreams=True -boost/*:without_json=True -boost/*:without_locale=True -boost/*:without_log=True -boost/*:without_math=True -boost/*:without_mpi=True -boost/*:without_nowide=True -boost/*:without_python=True -boost/*:without_random=True -boost/*:without_regex=True -boost/*:without_stacktrace=True -boost/*:without_test=True -boost/*:without_timer=True -boost/*:without_type_erasure=True -boost/*:without_wave=True -systemc/*:shared=False -systemc/*:disable_virtual_bind=False - -[generators] -CMakeDeps -CMakeToolchain - -[layout] -cmake_layout diff --git a/scc b/scc index ca01246..5824559 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit ca01246f5c1610e8caac0b3a5d0f2e0f36c4761c +Subproject commit 5824559e0d719ff8b259079c6b33ca0154f92ac9