Add swaglog to cereal/VisionIPC (#21758)

* add swaglog to VisionIPC

* add both flags

* add comment

* add cereal/logger to release

* bump cereal

* bump cereal

* link against common

* bump cereal
pull/21781/head
Willem Melching 2021-07-29 13:13:47 +02:00 committed by GitHub
parent d5b6746ac5
commit b69c304748
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 13 deletions

View File

@ -166,6 +166,10 @@ else:
if arch != "Darwin":
ldflags += ["-Wl,--as-needed"]
# Enable swaglog include in submodules
cflags += ["-DSWAGLOG"]
cxxflags += ["-DSWAGLOG"]
# change pythonpath to this
lenv["PYTHONPATH"] = Dir("#").path
@ -344,6 +348,17 @@ if GetOption("clazy"):
Export('env', 'qt_env', 'arch', 'real_arch', 'SHARED', 'USE_WEBCAM')
SConscript(['selfdrive/common/SConscript'])
Import('_common', '_gpucommon', '_gpu_libs')
if SHARED:
common, gpucommon = abspath(common), abspath(gpucommon)
else:
common = [_common, 'json11']
gpucommon = [_gpucommon] + _gpu_libs
Export('common', 'gpucommon')
# cereal and messaging are shared with the system
SConscript(['cereal/SConscript'])
if SHARED:
@ -354,18 +369,7 @@ else:
messaging = [File('#cereal/libmessaging.a')]
visionipc = [File('#cereal/libvisionipc.a')]
Export('cereal', 'messaging')
SConscript(['selfdrive/common/SConscript'])
Import('_common', '_gpucommon', '_gpu_libs')
if SHARED:
common, gpucommon = abspath(common), abspath(gpucommon)
else:
common = [_common, 'json11']
gpucommon = [_gpucommon] + _gpu_libs
Export('common', 'gpucommon', 'visionipc')
Export('cereal', 'messaging', 'visionipc')
# Build rednose library and ekf models

2
cereal

@ -1 +1 @@
Subproject commit 487ec1a6a4fbf65dac3cdd112901ea29d2843c88
Subproject commit aa2a1e9d800630f5975f31e187da747df1435d35

View File

@ -502,6 +502,7 @@ cereal/log.capnp
cereal/services.py
cereal/SConscript
cereal/include/**
cereal/logger/logger.h
cereal/messaging/.gitignore
cereal/messaging/__init__.py
cereal/messaging/bridge.cc