Normalize include paths

orocos-toolchain · Sep 26, 2020 · c1756f3 · c1756f3
1 parent 600102e
commit c1756f3
Show file tree

Hide file tree

Showing 686 changed files with 3,321 additions and 3,320 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,6 +123,7 @@ INCLUDE(config/rtt_macros.cmake)
 ###########################################################
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 ADD_SUBDIRECTORY(rtt)
 ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(tests)
@@ -154,7 +155,7 @@ set(IMPORTED_TARGET_PREFIX "imported_") # Prefix used in other projects to disti
 # Main package configuration file + target specific file
 CONFIGURE_FILE(orocos-rtt-config.cmake.in
                orocos-rtt-config-${OROCOS_TARGET}.cmake @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/orocos-rtt-config.cmake 
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/orocos-rtt-config.cmake
               ${CMAKE_CURRENT_BINARY_DIR}/orocos-rtt-config-${OROCOS_TARGET}.cmake
         DESTINATION "${CONFIG_FILE_PATH}")
 

diff --git a/rtt/Activity.cpp b/rtt/Activity.cpp
@@ -40,13 +40,13 @@
 #ifdef ORO_PRAGMA_INTERFACE
 #pragma implementation
 #endif
-#include "Time.hpp"
-#include "Activity.hpp"
-#include "os/MutexLock.hpp"
-#include "os/traces.h"
-#include "Logger.hpp"
-#include "rtt-fwd.hpp"
-#include "os/fosi_internal_interface.hpp"
+#include "rtt/Time.hpp"
+#include "rtt/Activity.hpp"
+#include "rtt/os/MutexLock.hpp"
+#include "rtt/os/traces.h"
+#include "rtt/Logger.hpp"
+#include "rtt/rtt-fwd.hpp"
+#include "rtt/os/fosi_internal_interface.hpp"
 
 #include <cmath>
 

diff --git a/rtt/Activity.hpp b/rtt/Activity.hpp
@@ -39,12 +39,12 @@
 #ifndef ORO_ACTIVITY_HPP
 #define ORO_ACTIVITY_HPP
 
-#include "Time.hpp"
-#include "base/RunnableInterface.hpp"
-#include "base/ActivityInterface.hpp"
-#include "os/Thread.hpp"
-#include "os/Mutex.hpp"
-#include "os/Condition.hpp"
+#include "rtt/Time.hpp"
+#include "rtt/base/RunnableInterface.hpp"
+#include "rtt/base/ActivityInterface.hpp"
+#include "rtt/os/Thread.hpp"
+#include "rtt/os/Mutex.hpp"
+#include "rtt/os/Condition.hpp"
 
 namespace RTT
 {

diff --git a/rtt/ArgumentDescription.cpp b/rtt/ArgumentDescription.cpp
@@ -36,7 +36,7 @@
  ***************************************************************************/
 
 
-#include "ArgumentDescription.hpp"
+#include "rtt/ArgumentDescription.hpp"
 
 using namespace RTT;
 

diff --git a/rtt/ArgumentDescription.hpp b/rtt/ArgumentDescription.hpp
@@ -39,7 +39,7 @@
 #define ARGUMENTDESCRIPTION_HPP
 
 #include <string>
-#include "rtt-config.h"
+#include "rtt/rtt-config.h"
 
 namespace RTT
 {

diff --git a/rtt/Attribute.cpp b/rtt/Attribute.cpp
@@ -36,8 +36,8 @@
  ***************************************************************************/
 
 
-#include "Attribute.hpp"
-#include "rtt-fwd.hpp"
+#include "rtt/Attribute.hpp"
+#include "rtt/rtt-fwd.hpp"
 
 namespace RTT
 {

diff --git a/rtt/Attribute.hpp b/rtt/Attribute.hpp
@@ -39,9 +39,9 @@
 #ifndef ORO_CORELIB_ATTRIBUTE_HPP
 #define ORO_CORELIB_ATTRIBUTE_HPP
 
-#include "internal/DataSource.hpp"
-#include "internal/DataSources.hpp"
-#include "base/AttributeBase.hpp"
+#include "rtt/internal/DataSource.hpp"
+#include "rtt/internal/DataSources.hpp"
+#include "rtt/base/AttributeBase.hpp"
 
 namespace RTT
 {

diff --git a/rtt/BufferPolicy.cpp b/rtt/BufferPolicy.cpp
@@ -26,7 +26,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "BufferPolicy.hpp"
+#include "rtt/BufferPolicy.hpp"
 #include <iostream>
 
 namespace RTT {

diff --git a/rtt/BufferPolicy.hpp b/rtt/BufferPolicy.hpp
@@ -30,7 +30,7 @@
 #ifndef ORO_BUFFER_POLICY_HPP
 #define ORO_BUFFER_POLICY_HPP
 
-#include "rtt-config.h"
+#include "rtt/rtt-config.h"
 #include <iosfwd>
 
 namespace RTT {

diff --git a/rtt/Component.hpp b/rtt/Component.hpp
@@ -50,8 +50,8 @@
 #include <string>
 #include <map>
 #include <vector>
-#include "rtt-fwd.hpp"
-#include "rtt-config.h"
+#include "rtt/rtt-fwd.hpp"
+#include "rtt/rtt-config.h"
 
 namespace RTT
 {
@@ -126,7 +126,7 @@ namespace RTT
  * You can only use this macro \b once in a .cpp file for the whole shared library \b and
  * you may \b not link with another component library when using this macro. Use
  * ORO_CREATE_COMPONENT_LIBRARY if you are in that situation.
- * 
+ *
  * It adds a function 'createComponent', which will return a new instance of
  * the library's component type and a function 'getComponentType', which returns
  * the type (namespace::class) name of the component.
@@ -153,7 +153,7 @@ extern "C" { \
 
 /**
  * Use this macro to create a component library which contains all components listed with
- * ORO_LIST_COMPONENT_TYPE. 
+ * ORO_LIST_COMPONENT_TYPE.
  *
  * It will add to your library an extern "C" function 'createComponentType' which can create a component of
  * each class added with ORO_LIST_COMPONENT_TYPE.

diff --git a/rtt/ConfigurationInterface.cpp b/rtt/ConfigurationInterface.cpp
@@ -37,8 +37,8 @@
 
 
 
-#include "ConfigurationInterface.hpp"
-#include "internal/mystd.hpp"
+#include "rtt/ConfigurationInterface.hpp"
+#include "rtt/internal/mystd.hpp"
 #include <functional>
 #include <boost/bind.hpp>
 

diff --git a/rtt/ConfigurationInterface.hpp b/rtt/ConfigurationInterface.hpp
@@ -41,11 +41,11 @@
 
 #include <memory>
 #include <map>
-#include "Attribute.hpp"
-#include "internal/DataSources.hpp"
-#include "base/DataObjectInterface.hpp"
-#include "Property.hpp"
-#include "PropertyBag.hpp"
+#include "rtt/Attribute.hpp"
+#include "rtt/internal/DataSources.hpp"
+#include "rtt/base/DataObjectInterface.hpp"
+#include "rtt/Property.hpp"
+#include "rtt/PropertyBag.hpp"
 
 namespace RTT
 {

diff --git a/rtt/ConnPolicy.cpp b/rtt/ConnPolicy.cpp
@@ -43,9 +43,9 @@
  *      Author: kaltan
  */
 
-#include "ConnPolicy.hpp"
-#include "Property.hpp"
-#include "PropertyBag.hpp"
+#include "rtt/ConnPolicy.hpp"
+#include "rtt/Property.hpp"
+#include "rtt/PropertyBag.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <iostream>

diff --git a/rtt/ConnPolicy.hpp b/rtt/ConnPolicy.hpp
@@ -41,9 +41,9 @@
 
 #include <string>
 #include <iosfwd>
-#include "rtt-fwd.hpp"
-#include "rtt-config.h"
-#include "BufferPolicy.hpp"
+#include "rtt/rtt-fwd.hpp"
+#include "rtt/rtt-config.h"
+#include "rtt/BufferPolicy.hpp"
 
 namespace RTT {
 

diff --git a/rtt/DataFlowInterface.cpp b/rtt/DataFlowInterface.cpp
@@ -36,10 +36,10 @@
  ***************************************************************************/
 
 
-#include "DataFlowInterface.hpp"
-#include "Logger.hpp"
-#include "Service.hpp"
-#include "TaskContext.hpp"
+#include "rtt/DataFlowInterface.hpp"
+#include "rtt/Logger.hpp"
+#include "rtt/Service.hpp"
+#include "rtt/TaskContext.hpp"
 
 namespace RTT
 {

diff --git a/rtt/DataFlowInterface.hpp b/rtt/DataFlowInterface.hpp
@@ -42,9 +42,9 @@
 #include <vector>
 #include <map>
 #include <string>
-#include "base/InputPortInterface.hpp"
-#include "base/OutputPortInterface.hpp"
-#include "rtt-fwd.hpp"
+#include "rtt/base/InputPortInterface.hpp"
+#include "rtt/base/OutputPortInterface.hpp"
+#include "rtt/rtt-fwd.hpp"
 #include <boost/function.hpp>
 
 namespace RTT

diff --git a/rtt/ExecutionEngine.cpp b/rtt/ExecutionEngine.cpp
@@ -37,16 +37,16 @@
 
 
 
-#include "Logger.hpp"
-#include "ExecutionEngine.hpp"
-#include "base/TaskCore.hpp"
-#include "rtt-fwd.hpp"
-#include "os/MutexLock.hpp"
-#include "internal/MWSRQueue.hpp"
-#include "TaskContext.hpp"
-#include "internal/CatchConfig.hpp"
-#include "extras/SlaveActivity.hpp"
-#include "os/traces.h"
+#include "rtt/Logger.hpp"
+#include "rtt/ExecutionEngine.hpp"
+#include "rtt/base/TaskCore.hpp"
+#include "rtt/rtt-fwd.hpp"
+#include "rtt/os/MutexLock.hpp"
+#include "rtt/internal/MWSRQueue.hpp"
+#include "rtt/TaskContext.hpp"
+#include "rtt/internal/CatchConfig.hpp"
+#include "rtt/extras/SlaveActivity.hpp"
+#include "rtt/os/traces.h"
 
 #include <boost/bind.hpp>
 #include <algorithm>

diff --git a/rtt/ExecutionEngine.hpp b/rtt/ExecutionEngine.hpp
@@ -39,19 +39,19 @@
 #ifndef ORO_EXECUTION_ENGINE_HPP
 #define ORO_EXECUTION_ENGINE_HPP
 
-#include "os/Mutex.hpp"
-#include "os/MutexLock.hpp"
-#include "os/Condition.hpp"
-#include "base/RunnableInterface.hpp"
-#include "base/ActivityInterface.hpp"
-#include "base/DisposableInterface.hpp"
-#include "base/ExecutableInterface.hpp"
-#include "internal/List.hpp"
+#include "rtt/os/Mutex.hpp"
+#include "rtt/os/MutexLock.hpp"
+#include "rtt/os/Condition.hpp"
+#include "rtt/base/RunnableInterface.hpp"
+#include "rtt/base/ActivityInterface.hpp"
+#include "rtt/base/DisposableInterface.hpp"
+#include "rtt/base/ExecutableInterface.hpp"
+#include "rtt/internal/List.hpp"
 #include <vector>
 #include <boost/function.hpp>
 
-#include "rtt-config.h"
-#include "internal/rtt-internal-fwd.hpp"
+#include "rtt/rtt-config.h"
+#include "rtt/internal/rtt-internal-fwd.hpp"
 
 namespace RTT
 {

diff --git a/rtt/FactoryExceptions.cpp b/rtt/FactoryExceptions.cpp
@@ -36,7 +36,7 @@
  ***************************************************************************/
 
 
-#include "FactoryExceptions.hpp"
+#include "rtt/FactoryExceptions.hpp"
 #include <sstream>
 
 namespace RTT {

diff --git a/rtt/FactoryExceptions.hpp b/rtt/FactoryExceptions.hpp
@@ -40,7 +40,7 @@
 
 #include <string>
 #include <exception>
-#include "rtt-config.h"
+#include "rtt/rtt-config.h"
 
 /**
  * \file FactoryExceptions.hpp This file contains some structs that can be thrown by both

diff --git a/rtt/FlowStatus.cpp b/rtt/FlowStatus.cpp
@@ -36,7 +36,7 @@
  ***************************************************************************/
 
 
-#include "FlowStatus.hpp"
+#include "rtt/FlowStatus.hpp"
 #include <string>
 
 using namespace std;

diff --git a/rtt/FlowStatus.hpp b/rtt/FlowStatus.hpp
@@ -42,7 +42,7 @@
 #include <ostream>
 #include <istream>
 
-#include "rtt-config.h"
+#include "rtt/rtt-config.h"
 
 namespace RTT {
     /**

diff --git a/rtt/Handle.cpp b/rtt/Handle.cpp
@@ -36,8 +36,8 @@
  ***************************************************************************/
 
 
-#include "Handle.hpp"
-#include "rtt-fwd.hpp"
+#include "rtt/Handle.hpp"
+#include "rtt/rtt-fwd.hpp"
 
 
 namespace RTT {

diff --git a/rtt/Handle.hpp b/rtt/Handle.hpp
@@ -39,7 +39,7 @@
 #ifndef ORO_CORELIB_SIGNAL_HANDLE_HPP
 #define ORO_CORELIB_SIGNAL_HANDLE_HPP
 
-#include "internal/SignalBase.hpp"
+#include "rtt/internal/SignalBase.hpp"
 
 namespace RTT
 {

diff --git a/rtt/InputPort.hpp b/rtt/InputPort.hpp
@@ -39,13 +39,13 @@
 #ifndef ORO_INPUT_PORT_HPP
 #define ORO_INPUT_PORT_HPP
 
-#include "base/InputPortInterface.hpp"
-#include "internal/Channels.hpp"
-#include "internal/InputPortSource.hpp"
-#include "Service.hpp"
-#include "OperationCaller.hpp"
+#include "rtt/base/InputPortInterface.hpp"
+#include "rtt/internal/Channels.hpp"
+#include "rtt/internal/InputPortSource.hpp"
+#include "rtt/Service.hpp"
+#include "rtt/OperationCaller.hpp"
 
-#include "OutputPort.hpp"
+#include "rtt/OutputPort.hpp"
 
 namespace RTT
 {

diff --git a/rtt/Logger.cpp b/rtt/Logger.cpp
@@ -37,12 +37,12 @@
 
 // to retrieve RTAI version, if any.
 //#define OROBLD_OS_LXRT_INTERNAL
-#include "os/StartStopManager.hpp"
-#include "os/MutexLock.hpp"
-#include "os/Mutex.hpp"
-#include "os/TimeService.hpp"
+#include "rtt/os/StartStopManager.hpp"
+#include "rtt/os/MutexLock.hpp"
+#include "rtt/os/Mutex.hpp"
+#include "rtt/os/TimeService.hpp"
 
-#include "Logger.hpp"
+#include "rtt/Logger.hpp"
 #include <iomanip>
 
 #ifdef OROSEM_PRINTF_LOGGING
@@ -57,13 +57,13 @@
 #   endif
 #  endif
 #  ifdef OROSEM_REMOTE_LOGGING
-#   include "base/BufferLockFree.hpp"
+#include "rtt/base/BufferLockFree.hpp"
 #  endif
 #endif
 
 #include <stdlib.h>
-#include "rtt-config.h"
-#include "rtt-fwd.hpp"
+#include "rtt/rtt-config.h"
+#include "rtt/rtt-fwd.hpp"
 
 namespace RTT
 {