Skip to content

Commit 66b640e

Browse files
committed
rename net cam file
1 parent 1c2dc58 commit 66b640e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+13
-11
lines changed

example/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.10)
22
project(example)
33

4-
add_subdirectory(GigeCam)
4+
add_subdirectory(NetCam)
55
add_subdirectory(CustomCam)
Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.16)
22

3-
project(gige_cam VERSION 1.0)
3+
project(net_cam VERSION 1.0)
44
message(STATUS "System Processor: ${CMAKE_SYSTEM_PROCESSOR}")
55
if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
66
set(PLATFORM_DIR "arm")
@@ -15,19 +15,19 @@ endif ()
1515
message(STATUS "Find MVCAM_LIB_DIR : ${MVCAM_LIB_DIR}")
1616
find_package(Threads REQUIRED)
1717
# **************************编译普通节点*****************************
18-
add_executable(${PROJECT_NAME}
18+
add_executable(zmq_node
1919
main.cpp
2020
mv_cam.cpp
2121
mv_cam.h
2222
)
23-
target_link_directories(${PROJECT_NAME} PRIVATE ${MVCAM_LIB_DIR})
24-
target_link_libraries(${PROJECT_NAME} PRIVATE
23+
target_link_directories(zmq_node PRIVATE ${MVCAM_LIB_DIR})
24+
target_link_libraries(zmq_node PRIVATE
2525
infinite_sense_core
2626
MvCameraControl
2727
Threads::Threads
2828
)
29-
target_include_directories(${PROJECT_NAME} PRIVATE mvcam/include)
30-
set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN")
29+
target_include_directories(zmq_node PRIVATE mvcam/include)
30+
set_target_properties(zmq_node PROPERTIES INSTALL_RPATH "$ORIGIN")
3131

3232
# **************************编译ROS2节点*****************************
3333
find_package(rclcpp QUIET)
@@ -66,6 +66,9 @@ else ()
6666
install(TARGETS ${PROJECT_NAME}_ros2
6767
DESTINATION lib/${PROJECT_NAME}
6868
)
69+
install(TARGETS infinite_sense_core
70+
DESTINATION lib/${PROJECT_NAME}
71+
)
6972
ament_package()
7073
endif ()
7174

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,7 @@ void MvCam::Start() {
258258
static int cam_index{1};
259259
name = "cam_" + std::to_string(cam_index++);
260260
LOG(WARNING) << "Camera name is empty,Create new name: " << name;
261-
}
262-
else {
261+
} else {
263262
LOG(INFO) << "Camera name is " << name;
264263
}
265264
cam_threads.emplace_back(&MvCam::Receive, this, handle, name);
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)