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

Jump to bottom

Compiles against official choreonoid and export package #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Compiles against official choreonoid and export package #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d46918e
Depend on choreonoid 1.8.1
arntanguy Nov 16, 2020
21098a4
[cmake] Allow finding choreonoid_ros
arntanguy Nov 19, 2020
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
4 changes: 1 addition & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ find_package(catkin REQUIRED COMPONENTS
choreonoid
)

# find_package(Qt5 COMPONENTS Widgets REQUIRED)

catkin_package(SKIP_CMAKE_CONFIG_GENERATION SKIP_PKG_CONFIG_GENERATION)
catkin_package()

if(CHOREONOID_CXX_STANDARD)
set(CMAKE_CXX_STANDARD ${CHOREONOID_CXX_STANDARD})
Expand Down
3 changes: 2 additions & 1 deletion package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<url type="website">http://choreonoid.org</url>
<url type="repository">https://github.com/choreonoid/choreonoid_ros_samples.git</url>
<buildtool_depend>catkin</buildtool_depend>
<depend>choreonoid</depend>
<build_depend version_gte="1.8.1">choreonoid</build_depend>
<exec_depend version_gte="1.8.1">choreonoid</exec_depend>
<depend>roscpp</depend>
<depend>std_msgs</depend>
<depend>sensor_msgs</depend>
Expand Down