From 47b54914ed48d07a935c9636b9cf209581ffac57 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 8 Jul 2024 15:56:58 +0300 Subject: [PATCH] g2o: update and enable OpenMP --- recipes/g2o/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/g2o/all/conanfile.py b/recipes/g2o/all/conanfile.py index 5dc07cd9925ad..ef6c617f1a545 100644 --- a/recipes/g2o/all/conanfile.py +++ b/recipes/g2o/all/conanfile.py @@ -67,7 +67,7 @@ class G2oConan(ConanFile): "sse4_1": True, "sse4_2": True, "sse4_a": False, - "with_openmp": False, + "with_openmp": True, "with_cholmod": False, "with_csparse": False, } @@ -128,7 +128,7 @@ def requirements(self): self.requires("freeglut/3.4.0", transitive_headers=True, transitive_libs=True) if self.options.with_openmp and self.settings.compiler in ["clang", "apple-clang"]: # Used in core/openmp_mutex.h, also '#pragma omp' is used in several core public headers - self.requires("llvm-openmp/17.0.6", transitive_headers=True, transitive_libs=True) + self.requires("llvm-openmp/18.1.8", transitive_headers=True, transitive_libs=True) if self.options.with_cholmod: self.requires("suitesparse-cholmod/5.2.1") if self.options.with_csparse: