Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ArmarXGui
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

896714b4

There was a problem fetching the pipeline summary.

Commit 896714b4 authored 8 years ago by Manfred Kröhnert

Downloads
- Plain Diff

Merge branch 'cmake' into 'master'

CMake: ArmarXGui.cmake is now included by default through the armarx_project() macro

See merge request !37

parents 7519b3bb a4f1baee

Loading

Pipeline #

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 0 additions, 2 deletions

CMakeLists.txt
etc/cmake/ArmarXGui.cmake 0 additions, 58 deletions

etc/cmake/ArmarXGui.cmake
etc/cmake/UseArmarXGui.cmake 58 additions, 2 deletions

etc/cmake/UseArmarXGui.cmake
source/ArmarXGui/gui-plugins/LoggingPlugin/CMakeLists.txt 0 additions, 2 deletions

source/ArmarXGui/gui-plugins/LoggingPlugin/CMakeLists.txt
source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/CMakeLists.txt 0 additions, 2 deletions

...rXGui/gui-plugins/ObserverPropertiesPlugin/CMakeLists.txt
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/CMakeLists.txt 0 additions, 2 deletions

...rXGui/gui-plugins/SystemStateMonitorPlugin/CMakeLists.txt

with 58 additions and 68 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment