Patch for OCL

Submitted by snrkiwi on Tue, 2009-03-03 02:35

To build with readline in non-standard install location.

Index: taskbrowser/CMakeLists.txt
===================================================================
--- taskbrowser/CMakeLists.txt (revision 30015)
+++ taskbrowser/CMakeLists.txt (working copy)
@@ -9,6 +9,8 @@
ELSE(NOT CURSES AND NOT READLINE)
OROCOS_PKGCONFIG_LIBS(ncurses readline)

+ INCLUDE_DIRECTORIES(${READLINE_H})
+
# This gathers all the .cpp files into the variable 'SRCS'
FILE( GLOB HPPS [^.]*.hpp )
FILE( GLOB SRCS [^.]*.cpp )

‹ problem deployer init.c The CTU presentation of fieldbus communications at Embedded World 2009 Exhibition (fwd) ›
»

Patch for OCL

Submitted by sspr on Tue, 2009-03-03 09:00.

On Tuesday 03 March 2009 02:27:39 Stephen Roderick wrote:
> To build with readline in non-standard install location.
>
> Index: taskbrowser/CMakeLists.txt
> ===================================================================
> --- taskbrowser/CMakeLists.txt (revision 30015)
> +++ taskbrowser/CMakeLists.txt (working copy)
> @@ -9,6 +9,8 @@
> ELSE(NOT CURSES AND NOT READLINE)
> OROCOS_PKGCONFIG_LIBS(ncurses readline)
>
> + INCLUDE_DIRECTORIES(${READLINE_H})
> +
> # This gathers all the .cpp files into the variable 'SRCS'
> FILE( GLOB HPPS [^.]*.hpp )
> FILE( GLOB SRCS [^.]*.cpp )

Ok. Since there are no readline headers included in TaskContext.hpp, this
should suffice.

Peter

»

Patch for OCL

Submitted by sspr on Tue, 2009-03-03 09:35.

On Tuesday 03 March 2009 09:55:12 Peter Soetens wrote:
> On Tuesday 03 March 2009 02:27:39 Stephen Roderick wrote:
> > To build with readline in non-standard install location.
> >
> > Index: taskbrowser/CMakeLists.txt
> > ===================================================================
> > --- taskbrowser/CMakeLists.txt (revision 30015)
> > +++ taskbrowser/CMakeLists.txt (working copy)
> > @@ -9,6 +9,8 @@
> > ELSE(NOT CURSES AND NOT READLINE)
> > OROCOS_PKGCONFIG_LIBS(ncurses readline)
> >
> > + INCLUDE_DIRECTORIES(${READLINE_H})
> > +
> > # This gathers all the .cpp files into the variable 'SRCS'
> > FILE( GLOB HPPS [^.]*.hpp )
> > FILE( GLOB SRCS [^.]*.cpp )
>
> Ok. Since there are no readline headers included in TaskContext.hpp, this
> should suffice.

I also modified this file such that it takes into account the NO_GPL flag and
does not require readline to be installed if set.

Peter

»