Skip to content

Commit

Permalink
dev-util/catkin: Install package.xml twice, once in ros_packages for …
Browse files Browse the repository at this point in the history
…fast searching/crawling, once in its standard location for other tools to find it.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
  • Loading branch information
aballier committed Feb 28, 2017
1 parent d3c7854 commit 4be2f65
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
File renamed without changes.
38 changes: 19 additions & 19 deletions dev-util/catkin/files/package_xml.patch
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Index: catkin-0.7.1/cmake/catkin_package.cmake
Index: catkin-0.7.6/cmake/catkin_package.cmake
===================================================================
--- catkin-0.7.1.orig/cmake/catkin_package.cmake
+++ catkin-0.7.1/cmake/catkin_package.cmake
@@ -518,6 +518,6 @@ function(_catkin_package)

# install package.xml
--- catkin-0.7.6.orig/cmake/catkin_package.cmake
+++ catkin-0.7.6/cmake/catkin_package.cmake
@@ -527,4 +527,7 @@ function(_catkin_package)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml
- DESTINATION share/${PROJECT_NAME}
+ DESTINATION share/ros_packages/${PROJECT_NAME}
DESTINATION share/${PROJECT_NAME}
)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml
+ DESTINATION share/ros_packages/${PROJECT_NAME}
+ )
endfunction()
Index: catkin-0.7.1/cmake/all.cmake
Index: catkin-0.7.6/cmake/all.cmake
===================================================================
--- catkin-0.7.1.orig/cmake/all.cmake
+++ catkin-0.7.1/cmake/all.cmake
--- catkin-0.7.6.orig/cmake/all.cmake
+++ catkin-0.7.6/cmake/all.cmake
@@ -156,7 +156,7 @@ foreach(filename
endforeach()

Expand All @@ -23,15 +23,15 @@ Index: catkin-0.7.1/cmake/all.cmake
message(STATUS "catkin ${catkin_VERSION}")
# ensure that no current package name is set
unset(_CATKIN_CURRENT_PACKAGE)
Index: catkin-0.7.1/cmake/catkin_metapackage.cmake
Index: catkin-0.7.6/cmake/catkin_metapackage.cmake
===================================================================
--- catkin-0.7.1.orig/cmake/catkin_metapackage.cmake
+++ catkin-0.7.1/cmake/catkin_metapackage.cmake
@@ -40,6 +40,6 @@ function(catkin_metapackage)

# install package.xml
--- catkin-0.7.6.orig/cmake/catkin_metapackage.cmake
+++ catkin-0.7.6/cmake/catkin_metapackage.cmake
@@ -42,4 +42,7 @@ function(catkin_metapackage)
install(FILES ${ARG_DIRECTORY}/package.xml
- DESTINATION share/${PROJECT_NAME}
+ DESTINATION share/ros_packages/${PROJECT_NAME}
DESTINATION share/${PROJECT_NAME}
)
+ install(FILES ${ARG_DIRECTORY}/package.xml
+ DESTINATION share/ros_packages/${PROJECT_NAME}
+ )
endfunction()

0 comments on commit 4be2f65

Please sign in to comment.