From 2a37a02dcdfbecc1eb5001154f1c6001f695ee2b Mon Sep 17 00:00:00 2001 From: Joachim Danmayr Date: Mon, 3 Feb 2025 17:09:51 +0000 Subject: [PATCH] chore: Added all the other libs --- .github/workflows/update-cache.yml | 2 +- conanfile.py | 42 ++++++++++++++---------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.github/workflows/update-cache.yml b/.github/workflows/update-cache.yml index fad97e3..e1b17b1 100644 --- a/.github/workflows/update-cache.yml +++ b/.github/workflows/update-cache.yml @@ -67,7 +67,7 @@ jobs: sudo conan upload openmp/system -r=imageclibs - name: Add fbgemm 0.8.0 - if: true + if: false run: | sudo conan export -r=imageclibs --version=0.8.0 recipes/fbgemm/all sudo conan upload fbgemm/0.8.0 -r=imageclibs diff --git a/conanfile.py b/conanfile.py index 83ecf98..f3b3371 100644 --- a/conanfile.py +++ b/conanfile.py @@ -14,28 +14,26 @@ class ImageC(ConanFile): exports_sources = "src/*" def requirements(self): - self.requires("fbgemm/0.8.0") - - #self.requires("qt/6.7.1") - #self.requires("opencv/4.10.0") - #self.requires("catch2/3.7.0") - #self.requires("pugixml/1.14") - #self.requires("nlohmann_json/3.11.3") - #self.requires("libxlsxwriter/1.1.8") - #self.requires("duckdb/1.1.0") - #self.requires("onnx/1.17.0", force=True) - #self.requires("rapidyaml/0.7.1") - #self.requires("tensorflow-lite/2.15.0") - #self.requires("onnxruntime/1.18.1") - #self.requires("libtorch/2.4.0") # Not supported for MinGW - #self.requires("flatbuffers/23.5.26", override=True) - #self.requires("protobuf/3.21.12", override=True) - #self.requires("xkbcommon/1.6.0", override=True) - #self.requires("libpq/15.5", override=True) - #self.requires("abseil/20240116.1", override=True) - #self.requires("libbacktrace/cci.20240730", override = True) - #self.requires("xnnpack/cci.20240229", override = True) - #self.requires("boost/1.86.0", override = True) + self.requires("qt/6.7.1") + self.requires("opencv/4.10.0") + self.requires("catch2/3.7.0") + self.requires("pugixml/1.14") + self.requires("nlohmann_json/3.11.3") + self.requires("libxlsxwriter/1.1.8") + self.requires("duckdb/1.1.0") + self.requires("onnx/1.17.0", force=True) + self.requires("rapidyaml/0.7.1") + self.requires("tensorflow-lite/2.15.0") + self.requires("onnxruntime/1.18.1") + self.requires("libtorch/2.4.0") # Not supported for MinGW + self.requires("flatbuffers/23.5.26", override=True) + self.requires("protobuf/3.21.12", override=True) + self.requires("xkbcommon/1.6.0", override=True) + self.requires("libpq/15.5", override=True) + self.requires("abseil/20240116.1", override=True) + self.requires("libbacktrace/cci.20240730", override = True) + self.requires("xnnpack/cci.20240229", override = True) + self.requires("boost/1.86.0", override = True)