From d3b5966d7e4b76aa9ea7bfadc71e92300af2e5b2 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 25 Nov 2021 08:20:31 +0100
Subject: [PATCH] Use SimoxUtility instead of Simox::SimoxUtility to fix cmake
on jenkins
---
.../applications/RobotControlUI/CMakeLists.txt | 6 +++++-
.../RobotAPI/libraries/aron/core/test/CMakeLists.txt | 10 +++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/source/RobotAPI/applications/RobotControlUI/CMakeLists.txt b/source/RobotAPI/applications/RobotControlUI/CMakeLists.txt
index 907e852da..250f9ed90 100644
--- a/source/RobotAPI/applications/RobotControlUI/CMakeLists.txt
+++ b/source/RobotAPI/applications/RobotControlUI/CMakeLists.txt
@@ -1,7 +1,11 @@
armarx_component_set_name(RobotControlUI)
-set(COMPONENT_LIBS Simox::SimoxUtility ArmarXCore RobotAPIOperations)
+set(COMPONENT_LIBS
+ SimoxUtility # Simox::SimoxUtility
+ ArmarXCore
+ RobotAPIOperations
+)
set(SOURCES main.cpp
RobotControlUI.cpp
diff --git a/source/RobotAPI/libraries/aron/core/test/CMakeLists.txt b/source/RobotAPI/libraries/aron/core/test/CMakeLists.txt
index 37aa8186e..e53a050be 100644
--- a/source/RobotAPI/libraries/aron/core/test/CMakeLists.txt
+++ b/source/RobotAPI/libraries/aron/core/test/CMakeLists.txt
@@ -22,7 +22,7 @@ armarx_add_test(
TEST_FILE
aronOperatorTest.cpp
LIBS
- Simox::SimoxUtility
+ SimoxUtility # Simox::SimoxUtility
ArmarXCore
RobotAPI::aron
INCLUDE_DIRECTORIES
@@ -38,7 +38,7 @@ armarx_add_test(
TEST_FILE
aronCodeGenerationTest.cpp
LIBS
- Simox::SimoxUtility
+ SimoxUtility # Simox::SimoxUtility
ArmarXCore
RobotAPI::aron
ARON_FILES
@@ -76,7 +76,7 @@ armarx_add_test(
TEST_FILE
aronNavigateTest.cpp
LIBS
- Simox::SimoxUtility
+ SimoxUtility # Simox::SimoxUtility
ArmarXCore
RobotAPI::aron
ARON_FILES
@@ -94,7 +94,7 @@ armarx_add_test(
TEST_FILE
aronExtendsTest.cpp
LIBS
- Simox::SimoxUtility
+ SimoxUtility # Simox::SimoxUtility
ArmarXCore
RobotAPI::aron
ARON_FILES
@@ -113,7 +113,7 @@ armarx_add_test(
TEST_FILE
aronRandomizedTest.cpp
LIBS
- Simox::SimoxUtility
+ SimoxUtility # Simox::SimoxUtility
ArmarXCore
RobotAPI::aron
ivt
--
GitLab