From fc5b4525abffc07a39c309f874c1af76baf3da4b Mon Sep 17 00:00:00 2001
From: Manfred Kroehnert <Manfred.Kroehnert@kit.edu>
Date: Mon, 10 Aug 2015 13:39:48 +0200
Subject: [PATCH] fix compilation error
---
.../components/RobotIK/test/RobotIKTestEnvironment.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/source/RobotComponents/components/RobotIK/test/RobotIKTestEnvironment.h b/source/RobotComponents/components/RobotIK/test/RobotIKTestEnvironment.h
index 0f7bb665..2cf2e9eb 100644
--- a/source/RobotComponents/components/RobotIK/test/RobotIKTestEnvironment.h
+++ b/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)
--
GitLab