Skip to content

Commit

Permalink
Merge pull request #37 from orocos-toolchain/cmake-disable-orogen
Browse files Browse the repository at this point in the history
Add CMake option BUILD_OROGEN and update metapackage manifest to format 3
  • Loading branch information
meyerj authored Nov 29, 2021
2 parents e055820 + 17e610c commit 96aa5b3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 15 deletions.
27 changes: 17 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ else()
set(CORBA_IMPLEMENTATION ${CORBA_IMPLEMENTATION} CACHE STRING "The implementation of CORBA to use (allowed values: TAO or OMNIORB )" )
endif()

#
# Enable/disable orogen and dependencies
#
option(BUILD_OROGEN "Build orogen and its dependencies" OFF)

#############
# Git magic #
#############
Expand Down Expand Up @@ -171,16 +176,18 @@ build_external_project(ocl
DEPENDS log4cpp rtt
)

build_external_project(utilrb)
build_external_project(typelib
DEPENDS utilrb
)
build_external_project(rtt_typelib
DEPENDS rtt typelib
)
build_external_project(orogen
DEPENDS rtt rtt_typelib utilrb
)
if(BUILD_OROGEN)
build_external_project(utilrb)
build_external_project(typelib
DEPENDS utilrb
)
build_external_project(rtt_typelib
DEPENDS rtt typelib
)
build_external_project(orogen
DEPENDS rtt rtt_typelib utilrb
)
endif()

#######################################
# Build orocos_toolchain meta package #
Expand Down
6 changes: 1 addition & 5 deletions orocos_toolchain/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>orocos_toolchain</name>
<version>2.9.0</version>
<description>
This package provides the entire orocos_toolchain
This metapackage provides Orocos RTT and OCL and dependencies.
</description>
<license>GPL v2 + linking exception</license>
<license>LGPL-2.1</license>
Expand All @@ -14,11 +14,7 @@

<exec_depend>log4cpp</exec_depend>
<exec_depend>ocl</exec_depend>
<exec_depend>orogen</exec_depend>
<exec_depend>rtt</exec_depend>
<exec_depend>rtt_typelib</exec_depend>
<exec_depend>typelib</exec_depend>
<exec_depend>utilrb</exec_depend>

<export>
<metapackage/>
Expand Down

0 comments on commit 96aa5b3

Please sign in to comment.