Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

export incldue directory #833

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

export incldue directory #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e62d441
export include/library/definition for child packages
k-okada Oct 6, 2021
2e5be54
add cmake/jsk_rviz_plugins.cmake.in to export -fPIC
k-okada Oct 6, 2021
208432d
ln -sf . jsk_rviz_plugins for solve fatal error: jsk_rviz_plugins/bo…
k-okada Oct 6, 2021
5fa0c90
include/jsk_rviz_plugins/ is better than src/ ?
k-okada Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions jsk_rviz_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,6 @@ generate_dynamic_reconfigure_options(
cfg/OverlayTextInterface.cfg)
generate_messages(DEPENDENCIES std_msgs geometry_msgs)

catkin_package(
DEPENDS rviz
CATKIN_DEPENDS jsk_hark_msgs jsk_footstep_msgs
jsk_recognition_utils cv_bridge people_msgs image_geometry
INCLUDE_DIRS # TODO include
LIBRARIES ${PROJECT_NAME}
)


set(ROS_BUILD_TYPE Release)

include_directories(src ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})

# TODO: fill in what other packages will need to use this package
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
Expand All @@ -68,7 +55,24 @@ if(rviz_QT_VERSION VERSION_LESS "5")
include(${QT_USE_FILE})
else()
find_package(Qt5Widgets REQUIRED)
set(QT_INCLUDE_DIR ${Qt5Widgets_INCLUDE_DIRS})
set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES};${_Qt5Widgets_PRIVATEDEPS})
endif()

catkin_package(
DEPENDS rviz
CATKIN_DEPENDS jsk_hark_msgs jsk_footstep_msgs
jsk_recognition_utils cv_bridge people_msgs image_geometry
INCLUDE_DIRS include ${QT_INCLUDE_DIR}
LIBRARIES ${PROJECT_NAME} ${QT_LIBRARIES}
CFG_EXTRAS jsk_rviz_plugins.cmake.in
)


set(ROS_BUILD_TYPE Release)

include_directories(src ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})

add_definitions(-DQT_NO_KEYWORDS -g)

include_directories(${CMAKE_CURRENT_BINARY_DIR})
Expand Down
9 changes: 9 additions & 0 deletions jsk_rviz_plugins/cmake/jsk_rviz_plugins.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# force automatic escaping of preprocessor definitions
cmake_policy(PUSH)
cmake_policy(SET CMP0005 NEW)

# add -fPIC to compile Qt based program
add_definitions(-fPIC)


cmake_policy(POP)
1 change: 1 addition & 0 deletions jsk_rviz_plugins/include/jsk_rviz_plugins
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../src