mirror of https://github.com/microsoft/vcpkg.git
[g2o] fix abs compiler path in binary (#42724)
This commit is contained in:
parent
4474162f65
commit
b322364f06
|
|
@ -2,6 +2,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|||
index c3b6ab5..f050970 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -485,7 +485,8 @@ set(G2O_HAVE_CHOLMOD ${CHOLMOD_FOUND})
|
||||
set(G2O_HAVE_CSPARSE ${G2O_USE_CSPARSE})
|
||||
set(G2O_SHARED_LIBS ${BUILD_SHARED_LIBS})
|
||||
set(G2O_LGPL_SHARED_LIBS ${BUILD_LGPL_SHARED_LIBS})
|
||||
-set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER}")
|
||||
+cmake_path(GET CMAKE_CXX_COMPILER FILENAME cxx_compiler)
|
||||
+set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${cxx_compiler}")
|
||||
|
||||
# Generate cmake configuration scripts
|
||||
set(G2O_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
|
||||
@@ -496,7 +496,6 @@ set(G2O_PROJECT_CONFIG "${G2O_GENERATED_DIR}/${PROJECT_NAME}Config.cmake")
|
||||
set(G2O_TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
|
||||
set(G2O_CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "g2o",
|
||||
"version-date": "2023-08-06",
|
||||
"port-version": 1,
|
||||
"description": "g2o: A General Framework for Graph Optimization",
|
||||
"homepage": "https://openslam.org/g2o.html",
|
||||
"dependencies": [
|
||||
|
|
|
|||
|
|
@ -2990,7 +2990,7 @@
|
|||
},
|
||||
"g2o": {
|
||||
"baseline": "2023-08-06",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"g3log": {
|
||||
"baseline": "2.4",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "6de83a9660c1f5b6e922a56140584c1dbdaa1643",
|
||||
"version-date": "2023-08-06",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "be30b61ad0d13087804bc474abea6673ba269a20",
|
||||
"version-date": "2023-08-06",
|
||||
|
|
|
|||
Loading…
Reference in New Issue