From 432dfc4c38bb6ba5c945a5fcea92907e0854289e Mon Sep 17 00:00:00 2001
From: armar-user <armar6@kit>
Date: Mon, 18 Jul 2022 08:44:52 +0200
Subject: [PATCH] hotfix: soqt linker errors
---
source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt | 5 +++--
source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt b/source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt
index aa66bf59..2c734ff0 100644
--- a/source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt
+++ b/source/ArmarXGui/applications/ArmarXGui/CMakeLists.txt
@@ -11,7 +11,7 @@ armarx_build_if(SoQt_FOUND "SoQt not available")
find_package(OpenMP)
# Add more libraries you depend on here, e.g. ${QT_LIBRARIES}.
-set(COMPONENT_LIBS ArmarXGuiBase ArmarXCore ${QT_LIBRARIES} ${Coin_LIBRARY_PATH} ${SoQt_LIBRARY_PATH})
+set(COMPONENT_LIBS ArmarXGuiBase ArmarXCore ${QT_LIBRARIES} ${Coin_LIBRARY_PATH}) # SoQT below
set(SOURCES ArmarXGuiApp.cpp
ArmarXMainWindow.cpp
@@ -53,7 +53,8 @@ armarx_gui_library(ArmarXGui "${SOURCES}" "${HEADERS}" "" "" "${COMPONENT_LIBS}"
target_include_directories(ArmarXGui PUBLIC ${UI_HEADER_DIR})
target_include_directories(ArmarXGui SYSTEM PUBLIC ${Coin_INCLUDE_DIR})
-target_include_directories(ArmarXGui SYSTEM PUBLIC ${SoQt_INCLUDE_DIRS} )
+# target_include_directories(ArmarXGui SYSTEM PUBLIC ${SoQt_INCLUDE_DIRS} )
+target_link_libraries(ArmarXGui PUBLIC SoQt::SoQt)
list(APPEND COMPONENT_LIBS ArmarXGui)
diff --git a/source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt b/source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt
index 08a2b688..058eba3d 100644
--- a/source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt
+++ b/source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt
@@ -7,7 +7,7 @@ armarx_build_if(Coin_FOUND "Coin3D not available")
armarx_build_if(SoQt_FOUND "SoQt not available")
set(LIB_NAME ArmarXGuiBase)
-set(LIBS ArmarXCoreJsonObject ArmarXCore ${Coin_LIBRARY_PATH} ${SoQt_LIBRARY_PATH})
+set(LIBS ArmarXCoreJsonObject ArmarXCore ${Coin_LIBRARY_PATH}) # SoQt below
set(FILES ArmarXWidgetController.cpp
ArmarXComponentWidgetController.cpp
@@ -93,5 +93,6 @@ armarx_gui_library("${LIB_NAME}"
if(Coin_FOUND AND SoQt_FOUND)
target_include_directories(${LIB_NAME} SYSTEM PUBLIC ${Coin_INCLUDE_DIR})
- target_include_directories(${LIB_NAME} SYSTEM PUBLIC ${SoQt_INCLUDE_DIRS})
+ # target_include_directories(${LIB_NAME} SYSTEM PUBLIC ${SoQt_INCLUDE_DIRS})
+ target_link_libraries(${LIB_NAME} PUBLIC SoQt::SoQt)
endif()
--
GitLab