Skip to content
Snippets Groups Projects
Commit 6216c150 authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

renamed coin includes

parent 1c03f97a
No related branches found
No related tags found
1 merge request!73Fix/rename coin3d to coin
......@@ -2,16 +2,16 @@
armarx_component_set_name(ArmarXGui)
armarx_find_qt(QtCore QtGui QtDesigner Network)
find_package(Coin3D REQUIRED)
find_package(Coin REQUIRED)
find_package(SoQt REQUIRED)
armarx_build_if(Coin3D_FOUND "Coin3D not available")
armarx_build_if(SOQT_FOUND "SoQt not available")
armarx_build_if(Coin_FOUND "Coin3D not available")
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} ${Coin3D_LIBRARIES} ${COIN3D_LIBRARIES} ${SoQt_LIBRARIES})
set(COMPONENT_LIBS ArmarXGuiBase ArmarXCore ${QT_LIBRARIES} ${Coin_LIBRARY_PATH} ${SoQt_LIBRARY_PATH})
set(SOURCES ArmarXGuiApp.cpp
ArmarXMainWindow.cpp
......@@ -52,7 +52,7 @@ list(APPEND HEADERS ${UI_HEADER})
armarx_gui_library(ArmarXGui "${SOURCES}" "${HEADERS}" "" "" "${COMPONENT_LIBS}" )
target_include_directories(ArmarXGui PUBLIC ${UI_HEADER_DIR})
target_include_directories(ArmarXGui SYSTEM PUBLIC ${Coin3D_INCLUDE_DIRS})
target_include_directories(ArmarXGui SYSTEM PUBLIC ${Coin_INCLUDE_DIR})
target_include_directories(ArmarXGui SYSTEM PUBLIC ${SoQt_INCLUDE_DIRS} )
list(APPEND COMPONENT_LIBS ArmarXGui)
......
armarx_set_target("Gui Library: ArmarXGuiBase")
find_package(Coin3D REQUIRED)
find_package(Coin REQUIRED)
find_package(SoQt REQUIRED)
armarx_build_if(Coin3D_FOUND "Coin3D not available")
armarx_build_if(SOQT_FOUND "SoQt not available")
armarx_build_if(Coin_FOUND "Coin3D not available")
armarx_build_if(SoQt_FOUND "SoQt not available")
set(LIB_NAME ArmarXGuiBase)
set(LIBS ArmarXCoreJsonObject ArmarXCore ${Coin3D_LIBRARIES} ${SoQt_LIBRARIES})
set(LIBS ArmarXCoreJsonObject ArmarXCore ${Coin_LIBRARY_PATH} ${SoQt_LIBRARY_PATH})
set(FILES ArmarXWidgetController.cpp
ArmarXComponentWidgetController.cpp
......@@ -91,7 +91,7 @@ armarx_gui_library("${LIB_NAME}"
)
if(Coin3D_FOUND AND SOQT_FOUND)
target_include_directories(${LIB_NAME} SYSTEM PUBLIC ${Coin3D_INCLUDE_DIRS})
target_include_directories(${LIB_NAME} SYSTEM PUBLIC ${SoQt_INCLUDE_DIRS} )
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})
endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment