Переглянути джерело

change apollo some .pro for use lib in /opt/apollo/neo/lib/catarc folder.

yuchuli 1 тиждень тому
батько
коміт
0c34b278fd

+ 2 - 1
src/apollo/code/apollochassis/apollochassis.pro

@@ -66,5 +66,6 @@ LIBS += -L/usr/local/lib/ -lbvar
 
 LIBS += -L/opt/apollo/neo/lib/3rd-protobuf -lprotobuf
 
-LIBS += -L$$PWD -ladchassis
+#LIBS += -L$$PWD -ladchassis
+LIBS += /opt/apollo/neo/lib/catarc/libadchassis.so
 

+ 9 - 11
src/apollo/code/apollodriver_hcp2/apollodriver_hcp2.pro

@@ -20,14 +20,13 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += \
         main.cpp \
-        /apollo_workspace/modules/common_msgs/localization_msgs/localization.pb.cc  \
-        /apollo_workspace/modules/common_msgs/localization_msgs/localization_status.pb.cc  \
-        /apollo_workspace/modules/common_msgs/localization_msgs/pose.pb.cc  \
-        /apollo_workspace/modules/common_msgs/basic_msgs/header.pb.cc  \
-        /apollo_workspace/modules/common_msgs/basic_msgs/pnc_point.pb.cc  \ 
-        /apollo_workspace/modules/common_msgs/basic_msgs/geometry.pb.cc  \
-        /apollo_workspace/modules/common_msgs/basic_msgs/error_code.pb.cc  \
-        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/transform_msgs/transform.pb.cc
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/localization_msgs/localization.pb.cc  \
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/localization_msgs/localization_status.pb.cc  \
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/localization_msgs/pose.pb.cc  \
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/basic_msgs/header.pb.cc  \
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/basic_msgs/pnc_point.pb.cc  \ 
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/basic_msgs/geometry.pb.cc  \
+        /apollo_workspace/bazel-bin/external/apollo_src/modules/common_msgs/basic_msgs/error_code.pb.cc
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
@@ -65,8 +64,6 @@ LIBS += /opt/apollo/neo/lib/cyber/croutine/*.so
 LIBS += /opt/apollo/neo/lib/cyber/event/*.so
 LIBS += /opt/apollo/neo/lib/cyber/time/*.so
 
-LIBS += /opt/apollo/neo/lib/modules/transform/*.so
-
 LIBS += -L/opt/apollo/neo/lib/3rd-fastdds-wrap -lfastrtps
 
 LIBS += -L/lib/aarch64-linux-gnu -lgflags -lglog
@@ -75,5 +72,6 @@ LIBS += -L/usr/local/lib/ -lbvar
 
 LIBS += -L/opt/apollo/neo/lib/3rd-protobuf -lprotobuf
 
-LIBS += -L$$PWD -lhcp2
+#LIBS += -L$$PWD -lhcp2
+LIBS += /opt/apollo/neo/lib/catarc/libhcp2.so
 

+ 3 - 1
src/apollo/code/apollodriver_nvcan/apollodriver_nvcan.pro

@@ -65,5 +65,7 @@ LIBS += -L/usr/local/lib/ -lbvar
 
 LIBS += -L/opt/apollo/neo/lib/3rd-protobuf -lprotobuf
 
-LIBS += -L$$PWD -lnvcan
+#LIBS += -L$$PWD -lnvcan
+LIBS += /opt/apollo/neo/lib/catarc/libnvcan.so
+