Parcourir la source

Merge branch 'yct' of http://47.108.171.148:10080/zzw/LidarMeasure into yct

yct il y a 4 ans
Parent
commit
df954a4417
2 fichiers modifiés avec 10 ajouts et 0 suppressions
  1. 6 0
      .gitignore
  2. 4 0
      CMakeLists.txt

+ 6 - 0
.gitignore

@@ -42,5 +42,11 @@ _ReSharper*/
 #Nuget packages folder
 packages/
 build/
+<<<<<<< HEAD
 cmake-build-debug/
+=======
+.vscode/**
+.idea/**
+cmake-build-debug/**
+>>>>>>> ed3ac757d3c2450fb86c81e20222b78d7c8c8e55
 .idea/**

+ 4 - 0
CMakeLists.txt

@@ -46,6 +46,10 @@ aux_source_directory(${CMAKE_CURRENT_LIST_DIR}/system_manager SYS_SRC )
 aux_source_directory(${CMAKE_CURRENT_LIST_DIR}/wj_lidar WJLIDAR_SRC )
 
 
+# plc test module
+#add_executable(plc_test  ./test/plc_test.cpp ${PLC_SRC} ${TASK_MANAGER_SRC} ${TOOL_SRC} ${ERROR_CODE_SRC})
+#target_link_libraries(plc_test ${OpenCV_LIBS}
+#        ${GLOG_LIBRARIES} ${PCL_LIBRARIES} ${PROTOBUF_LIBRARIES} ipopt modbus libnanomsg.so libnnxx.a libglog.a libgflags.a)
 
 add_executable(locate_sample  test/locate_sample.cpp ${LOCATE_SRC}  ${TASK_MANAGER_SRC} ${ERROR_SRC}
         ${TOOL_SRC})