Skip to content

Commit b322364

Browse files
authored
[g2o] fix abs compiler path in binary (#42724)
1 parent 4474162 commit b322364

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
lines changed

ports/g2o/fix-absolute.patch

+10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
22
index c3b6ab5..f050970 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5+
@@ -485,7 +485,8 @@ set(G2O_HAVE_CHOLMOD ${CHOLMOD_FOUND})
6+
set(G2O_HAVE_CSPARSE ${G2O_USE_CSPARSE})
7+
set(G2O_SHARED_LIBS ${BUILD_SHARED_LIBS})
8+
set(G2O_LGPL_SHARED_LIBS ${BUILD_LGPL_SHARED_LIBS})
9+
-set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER}")
10+
+cmake_path(GET CMAKE_CXX_COMPILER FILENAME cxx_compiler)
11+
+set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${cxx_compiler}")
12+
13+
# Generate cmake configuration scripts
14+
set(G2O_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
515
@@ -496,7 +496,6 @@ set(G2O_PROJECT_CONFIG "${G2O_GENERATED_DIR}/${PROJECT_NAME}Config.cmake")
616
set(G2O_TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
717
set(G2O_CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")

ports/g2o/vcpkg.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "g2o",
33
"version-date": "2023-08-06",
4+
"port-version": 1,
45
"description": "g2o: A General Framework for Graph Optimization",
56
"homepage": "https://openslam.org/g2o.html",
67
"dependencies": [

versions/baseline.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2990,7 +2990,7 @@
29902990
},
29912991
"g2o": {
29922992
"baseline": "2023-08-06",
2993-
"port-version": 0
2993+
"port-version": 1
29942994
},
29952995
"g3log": {
29962996
"baseline": "2.4",

versions/g-/g2o.json

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "6de83a9660c1f5b6e922a56140584c1dbdaa1643",
5+
"version-date": "2023-08-06",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "be30b61ad0d13087804bc474abea6673ba269a20",
510
"version-date": "2023-08-06",

0 commit comments

Comments
 (0)