From 582a4de14bef91df217f4f49624cf5b2b04bd7ca Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 11 Apr 2024 22:20:48 +0200 Subject: [PATCH] [baseline] Fix g2o blas detection (#38135) --- ports/g2o/portfile.cmake | 1 + ports/g2o/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/g2o.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake index 8c5ea9f012..fbfad1b960 100644 --- a/ports/g2o/portfile.cmake +++ b/ports/g2o/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LGPL_SHARED_LIBS) +file(REMOVE "${SOURCE_PATH}/cmake_modules/FindBLAS.cmake") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/g2o/vcpkg.json b/ports/g2o/vcpkg.json index 95acff43cb..efabcdf092 100644 --- a/ports/g2o/vcpkg.json +++ b/ports/g2o/vcpkg.json @@ -1,7 +1,7 @@ { "name": "g2o", "version-date": "2020-02-07", - "port-version": 5, + "port-version": 6, "description": "g2o: A General Framework for Graph Optimization", "homepage": "https://openslam.org/g2o.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a68c8fc7fe..2962e1e647 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2898,7 +2898,7 @@ }, "g2o": { "baseline": "2020-02-07", - "port-version": 5 + "port-version": 6 }, "g3log": { "baseline": "2.4", diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index e704d14737..ac8f6de43c 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcf90e398d2940de9be1685b435cc4314f348125", + "version-date": "2020-02-07", + "port-version": 6 + }, { "git-tree": "dd362c97bd5a71ae6c3abad13da61b6323e8746f", "version-date": "2020-02-07",