Skip to content
Snippets Groups Projects
Commit 506abbe7 authored by Christian Dreher's avatar Christian Dreher
Browse files

Merge branch 'feature/new-armarx-simulation' into 'main'

armarx/core/simulation: Add new simulation and bullet_armarx modules

See merge request !349
parents 6b6a0909 ca19b831
No related branches found
No related tags found
1 merge request!349armarx/core/simulation: Add new simulation and bullet_armarx modules
Pipeline #7654 passed
{
"general": {
"url": "https://git.h2t.iar.kit.edu/sw/armarx/core/simulation",
"authors": [
"Christian Dreher <c.dreher@kit.edu>",
"Patrick Hegemann <patrick.hegemann@kit.edu>"
]
},
"update": {
"git": {
"h2t_gitlab_slug": "sw/armarx/core/simulation"
}
},
"prepare": {
"cmake": {
"definitions": {
"CMAKE_C_COMPILER": "$ARMARX_C_COMPILER",
"CMAKE_CXX_COMPILER": "$ARMARX_CXX_COMPILER"
}
}
},
"build": "cmake",
"required_modules": {
"armarx/meta/compiler": {},
"armarx/ArmarXCore": {},
"armarx/ArmarXGui": {},
"armarx/RobotAPI": {}
}
}
{
"general": {
"url": "https://git.h2t.iar.kit.edu/sw/armarx-integration/simulation/bullet-armarx",
"authors": [
"Christian Dreher <c.dreher@kit.edu>",
"Patrick Hegemann <patrick.hegemann@kit.edu>"
]
},
"update": {
"git": {
"h2t_gitlab_slug": "sw/armarx-integration/simulation/bullet-armarx"
}
},
"prepare": {
"cmake": {
"project_name": "bullet_armarx",
"definitions": {
"CMAKE_C_COMPILER": "$ARMARX_C_COMPILER",
"CMAKE_CXX_COMPILER": "$ARMARX_CXX_COMPILER"
}
}
},
"build": "cmake",
"required_modules": {
"simox": {},
"armarx/meta/compiler": {},
"armarx/ArmarXCore": {},
"armarx/ArmarXGui": {},
"armarx/RobotAPI": {},
"armarx/core/simulation": {}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment