Skip to content
Snippets Groups Projects
Commit 80e80dfb authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Cleanup cmake

parent bca8c93a
No related branches found
No related tags found
No related merge requests found
......@@ -29,7 +29,7 @@ else()
find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
endif()
if (Simox_FOUND)
setupSimoxExternalLibraries()
setupSimoxExternalLibraries()
if(ARMARX_USE_QT5)
if(Simox_USE_QT4)
message(FATAL_ERROR "ArmarX uses Qt5 and Simox uses Qt4")
......
......@@ -44,7 +44,14 @@ if (ARMARX_BUILD)
include_directories(SYSTEM ${Eigen3_INCLUDE_DIR})
include_directories(${Simox_INCLUDE_DIR})
set(COMPONENT_LIBS RemoteRobotTestProjectInterfaces ArmarXInterfaces ArmarXCoreRemoteRobot ArmarXCore ${Simox_LIBRARIES} ${Coin3D_LIBRARIES})
set(COMPONENT_LIBS
RemoteRobotTestProjectInterfaces
ArmarXInterfaces
ArmarXCoreRemoteRobot
ArmarXCore
${Simox_LIBRARIES}
${Coin3D_LIBRARIES}
)
set(SOURCES RemoteRobotTestProject.cpp
RemoteRobotTestProject.h
......
......@@ -14,14 +14,8 @@ set(COMPONENT_LIBS
${Simox_LIBRARIES}
)
set(SOURCES
./ViewSelection.cpp
#@TEMPLATE_LINE@@COMPONENT_PATH@/@COMPONENT_NAME@.cpp
)
set(HEADERS
./ViewSelection.h
#@TEMPLATE_LINE@@COMPONENT_PATH@/@COMPONENT_NAME@.h
)
set(SOURCES ViewSelection.cpp)
set(HEADERS ViewSelection.h)
armarx_add_component("${SOURCES}" "${HEADERS}")
......
......@@ -17,7 +17,8 @@ set(LIBS
RobotAPICore
ArmarXCoreObservers
ArmarXCoreEigen3Variants
${Simox_LIBRARIES})
${Simox_LIBRARIES}
)
set(LIB_HEADERS
ForceTorqueObserver.h
......
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