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

Jump to bottom

fix build when included as a sub-project #475

Merged
merged 1 commit into from
Nov 21, 2019
Merged

fix build when included as a sub-project #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions rviz_common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,17 +312,17 @@ install(FILES default.rviz
)

install(
DIRECTORY "${CMAKE_SOURCE_DIR}/icons"
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/icons"
DESTINATION "share/${PROJECT_NAME}"
)

install(
DIRECTORY "${CMAKE_SOURCE_DIR}/images"
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/images"
DESTINATION "share/${PROJECT_NAME}"
)

install(
DIRECTORY "${CMAKE_SOURCE_DIR}/help"
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/help"
DESTINATION "share/${PROJECT_NAME}"
)

Expand Down
4 changes: 2 additions & 2 deletions rviz_default_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ install(
)

install(
DIRECTORY "${CMAKE_SOURCE_DIR}/icons"
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/icons"
DESTINATION "share/${PROJECT_NAME}"
)

Expand All @@ -326,7 +326,7 @@ if(BUILD_TESTING)
find_package(sensor_msgs REQUIRED)
find_package(visualization_msgs REQUIRED)

install(DIRECTORY "${CMAKE_SOURCE_DIR}/test/ogre_media_resources/test_meshes"
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/test/ogre_media_resources/test_meshes"
DESTINATION "share/rviz_default_plugins"
USE_SOURCE_PERMISSIONS)

Expand Down
2 changes: 1 addition & 1 deletion rviz_rendering/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/src/cmake/register_rviz_ogre_media_exports_h
install(DIRECTORY src/cmake
DESTINATION share/${PROJECT_NAME})

install(DIRECTORY "${CMAKE_SOURCE_DIR}/ogre_media"
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ogre_media"
DESTINATION "share/${PROJECT_NAME}"
USE_SOURCE_PERMISSIONS)

Expand Down
2 changes: 1 addition & 1 deletion rviz_rendering_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if(BUILD_TESTING)
"ogre_media_resources/meshes"
)

install(DIRECTORY "${CMAKE_SOURCE_DIR}/ogre_media_resources/test_meshes"
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ogre_media_resources/test_meshes"
DESTINATION "share/rviz_rendering_tests"
USE_SOURCE_PERMISSIONS)

Expand Down