Merge branch 'toolchain-2.3'

Conflicts:
	CMakeLists.txt
	debian/changelog

CMakeLists.txt

@@ -33,10 +33,10 @@ SET( PROJ_BINARY_DIR ${orocos-rtt_BINARY_DIR} )
 INCLUDE(${PROJ_SOURCE_DIR}/orocos-rtt.cmake OPTIONAL)
 if (NOT EXISTS ${PROJ_SOURCE_DIR}/orocos-rtt.cmake)
   # Setup the default settings
-  INCLUDE(${PROJ_SOURCE_DIR}/orocos-rtt.default.cmake)
   MESSAGE(
     "No orocos-rtt.cmake file loaded, using default settings."
     "See orocos-rtt.default.cmake")
+  INCLUDE(${PROJ_SOURCE_DIR}/orocos-rtt.default.cmake)
 endif ()
 
 IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

Makefile

@@ -1,4 +1,5 @@
 ifdef ROS_ROOT
+EXTRA_CMAKE_FLAGS=-DENABLE_CORBA=ON -DCORBA_IMPLEMENTATION=OMNIORB
 default: install
 include $(shell rospack find mk)/cmake.mk
 install: all

config/FindCorba.cmake

@@ -18,20 +18,26 @@ if (ENABLE_CORBA)
         ELSE(NOT TAO_FOUND)
             MESSAGE(STATUS "CORBA enabled: ${TAO_FOUND_COMPONENTS}")
 
-	    # Copy flags:
+	# Copy flags:
         SET(CORBA_INCLUDE_DIRS ${TAO_INCLUDE_DIRS})
-	    SET(CORBA_CFLAGS ${TAO_CPP_FLAGS})
+	SET(CORBA_CFLAGS ${TAO_CPP_FLAGS})
         SET(CORBA_LIBRARIES ${TAO_LIBRARIES})
-	    SET(CORBA_DEFINITIONS ${TAO_DEFINITIONS})
-	    # Flag used in rtt-corba-config.h
-	    SET(CORBA_IS_TAO 1)
+	SET(CORBA_DEFINITIONS ${TAO_DEFINITIONS})
+	# Flag used in rtt-corba-config.h
+	SET(CORBA_IS_TAO 1)
 
-	    if( TAO_Messaging_FOUND )
-	      SET(CORBA_TAO_HAS_MESSAGING 1)
-	    endif()
+	if( TAO_Messaging_FOUND )
+	  SET(CORBA_TAO_HAS_MESSAGING 1)
+	endif()
 
- 	    # Including a TAO header is sufficient to depend on this library.
-	    set(CORBA_USER_LINK_LIBS ${TAO_CLIENT_LIBRARIES})
+ 	# Including a TAO header is sufficient to depend on this library.
+	set(CORBA_USER_LINK_LIBS ${TAO_CLIENT_LIBRARIES} )
+
+	# We noticed TAO depends on librt as well on Linux platforms
+	if(${OROCOS_TARGET} MATCHES "gnulinux|xenomai|lxrt")
+	  set(CORBA_LIBRARIES ${CORBA_LIBRARIES} rt )
+	  set(CORBA_USER_LINK_LIBS ${CORBA_USER_LINK_LIBS} rt )
+	endif()
 
        ENDIF(NOT TAO_FOUND)
     ELSEIF(CORBA_IMPLEMENTATION STREQUAL "OMNIORB")

debian/changelog

@@ -4,6 +4,12 @@ orocos-rtt (2.4.0-1) unstable; urgency=low
 
  -- Peter Soetens <[email protected]>  Sat, 30 Apr 2011 01:12:22 +0200
 
+orocos-rtt (2.3.2-1) maverick; urgency=low
+
+  * New upstream release
+
+ -- Peter Soetens <[email protected]>  Tue, 03 May 2011 18:08:41 +0200
+
 orocos-rtt (2.3.1-1) unstable; urgency=low
 
   * New upstream release