scons: set warnings as error (#28004)
* navd: fix scons build warnings
* fix release
* sim fix
* fix docs
* build cabana
old-commit-hash: d5ab1e33c2
beeps
parent
3bb5167aa8
commit
33af4f9cde
5 changed files with 18 additions and 15 deletions
@ -1,21 +1,20 @@ |
|||||||
Import('qt_env', 'arch', 'common', 'messaging', 'visionipc', 'cereal', 'transformations') |
Import('qt_env', 'arch', 'common', 'messaging', 'visionipc', 'cereal', 'transformations') |
||||||
|
|
||||||
base_libs = [common, messaging, cereal, visionipc, transformations, 'zmq', |
map_env = qt_env.Clone() |
||||||
'capnp', 'kj', 'm', 'OpenCL', 'ssl', 'crypto', 'pthread'] + qt_env["LIBS"] |
libs = ['qt_widgets', 'qt_util', 'qmapboxgl', common, messaging, cereal, visionipc, transformations, |
||||||
|
'zmq', 'capnp', 'kj', 'm', 'OpenCL', 'ssl', 'crypto', 'pthread', 'json11'] + map_env["LIBS"] |
||||||
if arch == 'larch64': |
if arch == 'larch64': |
||||||
base_libs.append('EGL') |
libs.append('EGL') |
||||||
|
|
||||||
if arch in ['larch64', 'x86_64']: |
if arch in ['larch64', 'x86_64']: |
||||||
if arch == 'x86_64': |
if arch == 'x86_64': |
||||||
rpath = [Dir(f"#third_party/mapbox-gl-native-qt/{arch}").srcnode().abspath] |
rpath = Dir(f"#third_party/mapbox-gl-native-qt/{arch}").srcnode().abspath |
||||||
qt_env["RPATH"] += rpath |
map_env["RPATH"] += [rpath, ] |
||||||
|
|
||||||
style_path = File("style.json").abspath |
style_path = File("style.json").abspath |
||||||
qt_env['CXXFLAGS'].append(f'-DSTYLE_PATH=\\"{style_path}\\"') |
map_env['CXXFLAGS'].append(f'-DSTYLE_PATH=\\"{style_path}\\"') |
||||||
qt_libs = ["qt_widgets", "qt_util", "qmapboxgl"] + base_libs |
|
||||||
|
|
||||||
nav_src = ["main.cc", "map_renderer.cc"] |
|
||||||
qt_env.Program("map_renderer", nav_src, LIBS=qt_libs + ['common', 'json11']) |
|
||||||
|
|
||||||
qt_env.SharedLibrary("map_renderer", ["map_renderer.cc"], LIBS=qt_libs + ['common', 'messaging']) |
map_env["RPATH"].append(Dir('.').abspath) |
||||||
|
map_env["LIBPATH"].append(Dir('.').abspath) |
||||||
|
maplib = map_env.SharedLibrary("maprender", ["map_renderer.cc"], LIBS=libs) |
||||||
|
map_env.Program("map_renderer", ["main.cc", ], LIBS=[maplib[0].get_path(), ] + libs) |
||||||
|
Loading…
Reference in new issue