Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
talos-data
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stack Of Tasks
talos-data
Commits
eb1db504
Commit
eb1db504
authored
5 years ago
by
Olivier Stasse
Browse files
Options
Downloads
Patches
Plain Diff
[cmake] Synchronize
CMakeLists.txt change to appropriate Gazebo version.
parent
bccc5ac0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#6273
failed
5 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+5
-3
5 additions, 3 deletions
CMakeLists.txt
cmake
+1
-1
1 addition, 1 deletion
cmake
with
6 additions
and
4 deletions
CMakeLists.txt
+
5
−
3
View file @
eb1db504
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8.3
)
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8.3
)
INCLUDE
(
cmake/base.cmake
)
#include(cmake/ros.cmake)
SET
(
PROJECT_ORG pyrene-dev
)
SET
(
PROJECT_ORG pyrene-dev
)
SET
(
PROJECT_NAME talos_data
)
SET
(
PROJECT_NAME talos_data
)
SET
(
PROJECT_DESCRIPTION
"Talos urdf model, srdf model and other data"
)
SET
(
PROJECT_DESCRIPTION
"Talos urdf model, srdf model and other data"
)
SET
(
PROJECT_URL
"https://gepgitlab.laas.fr/
${
PROJECT_ORG
}
/
${
PROJECT_NAME
}
"
)
SET
(
PROJECT_URL
"https://gepgitlab.laas.fr/
${
PROJECT_ORG
}
/
${
PROJECT_NAME
}
"
)
#include(cmake/ros.cmake)
INCLUDE
(
cmake/base.cmake
)
set
(
CXX_DISABLE_WERROR True
)
set
(
CXX_DISABLE_WERROR True
)
SETUP_PROJECT
()
SETUP_PROJECT
()
...
@@ -21,7 +23,7 @@ catkin_package(
...
@@ -21,7 +23,7 @@ catkin_package(
# Find xml_reflection
# Find xml_reflection
ADD_REQUIRED_DEPENDENCY
(
"urdfdom >= 0.2.9"
)
ADD_REQUIRED_DEPENDENCY
(
"urdfdom >= 0.2.9"
)
ADD_REQUIRED_DEPENDENCY
(
"gazebo >= 7.
12
.0"
)
ADD_REQUIRED_DEPENDENCY
(
"gazebo >= 7.
0
.0"
)
ADD_REQUIRED_DEPENDENCY
(
roscpp
)
ADD_REQUIRED_DEPENDENCY
(
roscpp
)
SET
(
LIBRARY_NAME
${
PROJECT_NAME
}
)
SET
(
LIBRARY_NAME
${
PROJECT_NAME
}
)
...
...
This diff is collapsed.
Click to expand it.
cmake
@
192812cc
Compare
9e335a1c
...
192812cc
Subproject commit
9e335a1c690403f6dab12ea6707fd9cfd0f596d2
Subproject commit
192812cc2c5d8aaffbc8536d0b0a2a7c11dad53b
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment