Merge branch 'master' of https://i61wiki.itec.uka.de/git/robotcomponents

source/RobotComponents/components/RobotIK/test/RobotIKTestEnvironment.h

@@ -41,10 +41,11 @@ public:
     {
         Ice::PropertiesPtr properties = Ice::createProperties();
         armarx::Application::LoadDefaultConfig(properties);
-        armarx::CMakePackageFinder finder("RobotAPI");
+        const std::string project = "RobotAPI";
+        armarx::CMakePackageFinder finder(project);
         if (!finder.packageFound())
         {
-            ARMARX_ERROR << "ArmarX Package " << project << " has not been found!";
+            ARMARX_ERROR_S << "ArmarX Package " << project << " has not been found!";
         } else
         {
             armarx::ArmarXDataPath::addDataPaths(finder.getDataDir());
@@ -58,9 +59,9 @@ public:
         properties->setProperty("ArmarX.RobotStateComponent.RobotNodeSetName", "Robot");
         properties->setProperty("ArmarX.RobotIK.RobotFileName", robotFilename);
         properties->setProperty("ArmarX.RobotIK.RobotStateComponentName", "RobotStateComponent");
-        
+
         _spaceSavePath = test::getCmakeValue("PROJECT_BINARY_DIR") + "/Testing/Temporary/spaces/";
-        
+
         if (loadSpaces)
         {
             properties->setProperty("ArmarX.RobotIK.ReachabilitySpacesFolder", _spaceSavePath);
@@ -69,7 +70,7 @@ public:
 
         _iceTestHelper = new IceTestHelper(registryPort, registryPort + 1);
         _iceTestHelper->startEnvironment();
-        
+
         _manager = new TestArmarXManager(testName, _iceTestHelper->getCommunicator(), properties);
 
         if (addObjects)

source/RobotComponents/gui-plugins/RobotIKPlugin/RobotIKConfigDialog.h

@@ -25,7 +25,7 @@
 #define RobotIKCONFIGDIALOG_H
 
 //ArmarX includes
-#include <Gui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h>
+#include <ArmarXGui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h>
 
 //Qt includes
 #include <QDialog>

source/RobotComponents/gui-plugins/RobotIKPlugin/RobotIKGuiPlugin.h

@@ -30,8 +30,8 @@
 #include "ui_RobotIKGuiPlugin.h"
 
 //ArmarX includes
-#include <Gui/libraries/ArmarXGuiBase/ArmarXGuiPlugin.h>
-#include <Gui/libraries/ArmarXGuiBase/ArmarXComponentWidgetController.h>
+#include <ArmarXGui/libraries/ArmarXGuiBase/ArmarXGuiPlugin.h>
+#include <ArmarXGui/libraries/ArmarXGuiBase/ArmarXComponentWidgetController.h>
 #include <RobotComponents/interface/components/RobotIK.h>
 #include <RobotAPI/interface/core/RobotState.h>
 #include <RobotAPI/libraries/core/remoterobot/RemoteRobot.h>