Skip to content
Snippets Groups Projects
Commit 4b753e79 authored by Eloy Retamino's avatar Eloy Retamino Committed by Ugo Albanese
Browse files

[NRRPLT-7942] updated scripts to build gzbridge in ubuntu 20.04

parent a60086c6
No related branches found
No related tags found
No related merge requests found
...@@ -52,7 +52,7 @@ else() ...@@ -52,7 +52,7 @@ else()
endif() endif()
include(FindBoost) include(FindBoost)
find_package(Boost ${MIN_BOOST_VERSION} REQUIRED system filesystem regex thread) find_package(Boost ${MIN_BOOST_VERSION} REQUIRED system filesystem regex thread program_options iostreams date_time)
find_package(Protobuf REQUIRED) find_package(Protobuf REQUIRED)
# Find tinyxml. Only debian distributions package tinyxml with a pkg-config # Find tinyxml. Only debian distributions package tinyxml with a pkg-config
......
...@@ -33,6 +33,10 @@ make -j `nproc` ...@@ -33,6 +33,10 @@ make -j `nproc`
cd ../gzbridge cd ../gzbridge
$DIR/node_modules/.bin/node-gyp configure $DIR/node_modules/.bin/node-gyp configure
# gazebo pkg-config in binding.gyp adds some weird -lBoost::* dependencies to the build command that can't be found. Manually replacing them with the right boost library names
sed -i 's/Boost::/boost_/g' build/gzbridge.target.mk
$DIR/node_modules/.bin/node-gyp build -r $DIR/node_modules/.bin/node-gyp build -r
RETVAL=$? RETVAL=$?
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
"pb2json.cc", "pb2json.hh", "pb2json.cc", "pb2json.hh",
"ConfigLoader.cc", "ConfigLoader.hh", "ConfigLoader.cc", "ConfigLoader.hh",
"OgreMaterialParser.cc", "OgreMaterialParser.hh"], "OgreMaterialParser.cc", "OgreMaterialParser.hh"],
'cflags_cc': [ '-std=c++17' ],
'cflags_cc!': [ '-fno-rtti', '-fno-exceptions' ], 'cflags_cc!': [ '-fno-rtti', '-fno-exceptions' ],
'cflags!': [ '-fno-exceptions' ], 'cflags!': [ '-fno-exceptions' ],
"include_dirs": [ "include_dirs": [
......
{ {
"name": "gzweb", "name": "gzweb",
"version": "3.0.5", "version": "3.0.0",
"description": "WebGL client for Gazebo", "description": "WebGL client for Gazebo",
"repository": { "repository": {
"type": "mercurial", "type": "mercurial",
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
"dependencies": { "dependencies": {
"debug": "^2.6.1", "debug": "^2.6.1",
"http-server": "", "http-server": "",
"node-gyp": "3.8.0", "node-gyp": "5.0.5",
"websocket": "", "websocket": "",
"wide-align": "1.1.0", "wide-align": "1.1.0",
"request": "2.81.0" "request": "2.81.0"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment