mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-10-01 03:43:46 +08:00
Build panda/SConscript (#26646)
* panda/SConscript * think this is right? * bump panda * fix test_models * use a filter * bump panda to mater * more aesthetic ordering * alphabetical :( * alphabetical :( old-commit-hash: 01dac5d06bcd518e6c2daab8c41979b0553b73a6
This commit is contained in:
+3
-6
@@ -300,7 +300,7 @@ if arch == "Darwin":
|
||||
else:
|
||||
qt_install_prefix = subprocess.check_output(['qmake', '-query', 'QT_INSTALL_PREFIX'], encoding='utf8').strip()
|
||||
qt_install_headers = subprocess.check_output(['qmake', '-query', 'QT_INSTALL_HEADERS'], encoding='utf8').strip()
|
||||
|
||||
|
||||
qt_env['QTDIR'] = qt_install_prefix
|
||||
qt_dirs = [
|
||||
f"{qt_install_headers}",
|
||||
@@ -409,10 +409,10 @@ if arch != "Darwin":
|
||||
|
||||
# build submodules
|
||||
SConscript([
|
||||
'cereal/SConscript',
|
||||
'body/board/SConscript',
|
||||
'panda/board/SConscript',
|
||||
'cereal/SConscript',
|
||||
'opendbc/can/SConscript',
|
||||
'panda/SConscript',
|
||||
])
|
||||
|
||||
SConscript(['third_party/SConscript'])
|
||||
@@ -442,9 +442,6 @@ if arch in ['x86_64', 'Darwin'] or GetOption('extras'):
|
||||
Export('opendbc')
|
||||
SConscript(['tools/cabana/SConscript'])
|
||||
|
||||
if GetOption('test'):
|
||||
SConscript('panda/tests/safety/SConscript')
|
||||
|
||||
external_sconscript = GetOption('external_sconscript')
|
||||
if external_sconscript:
|
||||
SConscript([external_sconscript])
|
||||
|
||||
Reference in New Issue
Block a user