Fix the RViz plugin. (#237)

master
Wolfgang Hess 2016-12-20 17:42:56 +01:00 committed by GitHub
parent 58069b0033
commit 9311be0f7a
1 changed files with 4 additions and 2 deletions

View File

@ -41,11 +41,10 @@ catkin_package(
) )
file(GLOB_RECURSE ALL_SRCS "*.cc" "*.h") file(GLOB_RECURSE ALL_SRCS "*.cc" "*.h")
message(${ALL_SRCS}) set(CMAKE_AUTOMOC ON)
add_library(${PROJECT_NAME} ${ALL_SRCS}) add_library(${PROJECT_NAME} ${ALL_SRCS})
target_link_libraries(${PROJECT_NAME} PUBLIC ${QT_LIBRARIES}) target_link_libraries(${PROJECT_NAME} PUBLIC ${QT_LIBRARIES})
set(CMAKE_AUTOMOC ON)
if(rviz_QT_VERSION VERSION_LESS "5") if(rviz_QT_VERSION VERSION_LESS "5")
message(STATUS "Using Qt4 based on the rviz_QT_VERSION: ${rviz_QT_VERSION}") message(STATUS "Using Qt4 based on the rviz_QT_VERSION: ${rviz_QT_VERSION}")
find_package(Qt4 ${rviz_QT_VERSION} EXACT REQUIRED QtCore QtGui) find_package(Qt4 ${rviz_QT_VERSION} EXACT REQUIRED QtCore QtGui)
@ -69,6 +68,9 @@ target_include_directories(${PROJECT_NAME} PUBLIC
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
target_include_directories(${PROJECT_NAME} PUBLIC ${CARTOGRAPHER_INCLUDE_DIRS})
target_link_libraries(${PROJECT_NAME} PUBLIC ${CARTOGRAPHER_LIBRARIES})
target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
"${EIGEN3_INCLUDE_DIR}") "${EIGEN3_INCLUDE_DIR}")
target_link_libraries(${PROJECT_NAME} PUBLIC ${EIGEN3_LIBRARIES}) target_link_libraries(${PROJECT_NAME} PUBLIC ${EIGEN3_LIBRARIES})