Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some cleanup in package.xml and CMakeLists.txt #13

Merged
merged 1 commit into from
Jul 19, 2014
Merged

Some cleanup in package.xml and CMakeLists.txt #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions theora_image_transport/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
project(theora_image_transport)

find_package(OpenCV REQUIRED)
find_package(catkin REQUIRED cv_bridge dynamic_reconfigure image_transport message_generation tf rosbag)
find_package(catkin REQUIRED COMPONENTS cv_bridge dynamic_reconfigure image_transport message_generation tf rosbag pluginlib std_msgs)

add_message_files(DIRECTORY msg FILES Packet.msg)

Expand All @@ -21,7 +21,7 @@ generate_dynamic_reconfigure_options(cfg/TheoraPublisher.cfg cfg/TheoraSubscribe
catkin_package(
INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS message_runtime
CATKIN_DEPENDS message_runtime std_msgs
)

include_directories(include ${catkin_INCLUDE_DIRS})
Expand All @@ -43,20 +43,18 @@ add_definitions(${PC_OGG_CFLAGS_OTHER}
)

add_library(${PROJECT_NAME} src/theora_publisher.cpp src/theora_subscriber.cpp src/manifest.cpp)
add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_gencfg)
add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_gencfg ${PROJECT_NAME}_gencpp)
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES}
${OpenCV_LIBRARIES}
${PC_OGG_LIBRARIES}
${PC_THEORA_LIBRARIES}
${PC_THEORAENC_LIBRARIES}
${PC_THEORADEC_LIBRARIES}
# ogg theora theoraenc theoradec
)

class_loader_hide_library_symbols(${PROJECT_NAME})

add_executable(ogg_saver src/ogg_saver.cpp)
include_directories(ogg_saver include cfg/cpp)
target_link_libraries(ogg_saver ${PC_THEORA_LIBRARY}
${PC_OGG_LIBRARY}
${OpenCV_LIBRARIES}
Expand Down
3 changes: 2 additions & 1 deletion theora_image_transport/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<build_depend>pluginlib</build_depend>
<build_depend>rosbag</build_depend>
<build_depend>tf</build_depend>
<build_depend>std_msgs</build_depend>

<run_depend>cv_bridge</run_depend>
<run_depend>dynamic_reconfigure</run_depend>
Expand All @@ -33,9 +34,9 @@
<run_depend>pluginlib</run_depend>
<run_depend>rosbag</run_depend>
<run_depend>tf</run_depend>
<run_depend>std_msgs</run_depend>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this just vestigial or something?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must have been copy and paste bug, I don't see any history of a plugin_description.xml file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes that is what I assumed

<export>
<rviz plugin="${prefix}/plugin_description.xml"/>
<image_transport plugin="${prefix}/theora_plugins.xml" />
</export>
</package>