Skip to content

Commit 96aa5b3

Browse files
authored
Merge pull request #37 from orocos-toolchain/cmake-disable-orogen
Add CMake option BUILD_OROGEN and update metapackage manifest to format 3
2 parents e055820 + 17e610c commit 96aa5b3

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

Diff for: CMakeLists.txt

+17-10
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ else()
8080
set(CORBA_IMPLEMENTATION ${CORBA_IMPLEMENTATION} CACHE STRING "The implementation of CORBA to use (allowed values: TAO or OMNIORB )" )
8181
endif()
8282

83+
#
84+
# Enable/disable orogen and dependencies
85+
#
86+
option(BUILD_OROGEN "Build orogen and its dependencies" OFF)
87+
8388
#############
8489
# Git magic #
8590
#############
@@ -171,16 +176,18 @@ build_external_project(ocl
171176
DEPENDS log4cpp rtt
172177
)
173178

174-
build_external_project(utilrb)
175-
build_external_project(typelib
176-
DEPENDS utilrb
177-
)
178-
build_external_project(rtt_typelib
179-
DEPENDS rtt typelib
180-
)
181-
build_external_project(orogen
182-
DEPENDS rtt rtt_typelib utilrb
183-
)
179+
if(BUILD_OROGEN)
180+
build_external_project(utilrb)
181+
build_external_project(typelib
182+
DEPENDS utilrb
183+
)
184+
build_external_project(rtt_typelib
185+
DEPENDS rtt typelib
186+
)
187+
build_external_project(orogen
188+
DEPENDS rtt rtt_typelib utilrb
189+
)
190+
endif()
184191

185192
#######################################
186193
# Build orocos_toolchain meta package #

Diff for: orocos_toolchain/package.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<name>orocos_toolchain</name>
55
<version>2.9.0</version>
66
<description>
7-
This package provides the entire orocos_toolchain
7+
This metapackage provides Orocos RTT and OCL and dependencies.
88
</description>
99
<license>GPL v2 + linking exception</license>
1010
<license>LGPL-2.1</license>
@@ -14,11 +14,7 @@
1414

1515
<exec_depend>log4cpp</exec_depend>
1616
<exec_depend>ocl</exec_depend>
17-
<exec_depend>orogen</exec_depend>
1817
<exec_depend>rtt</exec_depend>
19-
<exec_depend>rtt_typelib</exec_depend>
20-
<exec_depend>typelib</exec_depend>
21-
<exec_depend>utilrb</exec_depend>
2218

2319
<export>
2420
<metapackage/>

0 commit comments

Comments
 (0)