more

commaai · Aug 1, 2024 · fb31279 · fb31279
1 parent a6ae2ed
commit fb31279
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/3rdparty/opendbc b/3rdparty/opendbc
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -162,7 +162,9 @@ include_directories(
     ./3rdparty/lua-5.4.3/src
     ./3rdparty/QCodeEditor/include
     ./3rdparty/lz4
-    ./3rdparty/opendbc/can
+    ./3rdparty/opendbc
+    ./3rdparty/opendbc/opendbc
+    ./3rdparty/opendbc/opendbc/can
     ./3rdparty/cereal/messaging
     ./3rdparty/cereal
 )

diff --git a/cmake/FindCereal.cmake b/cmake/FindCereal.cmake
@@ -5,7 +5,7 @@ else (Cereal_LIBRARIES AND Cereal_INCLUDE_DIRS)
 
   # build cereal before we search for required Cereal plugin libs below
   execute_process(
-    COMMAND scons -j$(nproc) --minimal
+    COMMAND scons -j8 --minimal
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/cereal
   )
 

diff --git a/cmake/FindRlog.cmake b/cmake/FindRlog.cmake
@@ -75,7 +75,7 @@ else (Rlog_INCLUDE_DIRS AND Rlog_LIBRARIES)
   #### find opendbc common
   find_path(Rlog_opendbc_INCLUDE_DIR
     NAMES common.h
-    PATHS ${CMAKE_SOURCE_DIR}/3rdparty/opendbc/can
+    PATHS ${CMAKE_SOURCE_DIR}/3rdparty/opendbc/opendbc/can
           /usr/include
           /usr/local/include
           /opt/local/include

diff --git a/plotjuggler_plugins/DataLoadRlog/CMakeLists.txt b/plotjuggler_plugins/DataLoadRlog/CMakeLists.txt
@@ -8,15 +8,15 @@ if(Rlog_FOUND)
   add_definitions(${QT_DEFINITIONS})
   add_definitions(-DQT_PLUGIN)
   add_definitions(-DDYNAMIC_CAPNP)
-  add_definitions(-DDBC_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc")
+  add_definitions(-DDBC_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/opendbc/dbc")
 
   SET(SRC
     rlog_parser.cpp
     dataload_rlog.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/can/common.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/can/dbc.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/can/packer.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/can/parser.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/opendbc/can/common.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/opendbc/can/dbc.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/opendbc/can/packer.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/opendbc/can/parser.cc
   )
 
   add_definitions(-L /usr/local/lib)
@@ -33,4 +33,4 @@ if(Rlog_FOUND)
 
 else()
   message("[Rlog] not found. Skipping plugin DataStreamRlog.")
-endif()
+endif()
diff --git a/plotjuggler_plugins/DataStreamCereal/CMakeLists.txt b/plotjuggler_plugins/DataStreamCereal/CMakeLists.txt
@@ -7,17 +7,17 @@ if(Cereal_FOUND AND Rlog_FOUND)
   add_definitions(${QT_DEFINITIONS})
   add_definitions(-DQT_PLUGIN)
   add_definitions(-DDYNAMIC_CAPNP)
-  add_definitions(-DDBC_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc")
+  add_definitions(-DDBC_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/opendbc/dbc")
 
   QT5_WRAP_UI ( UI_SRC  datastream_cereal.ui  )
 
   SET(SRC
     datastream_cereal.cpp
     ../DataLoadRlog/rlog_parser.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/can/common.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/can/dbc.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/can/packer.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/can/parser.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/opendbc/can/common.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/opendbc/can/dbc.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/opendbc/can/packer.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/opendbc/opendbc/can/parser.cc
   )
 
   add_library(DataStreamCereal SHARED ${SRC} ${UI_SRC}  )
@@ -31,4 +31,4 @@ if(Cereal_FOUND AND Rlog_FOUND)
 
 else()
   message("[Cereal] not found. Skipping plugin DataStreamCereal.")
-endif()
+endif()