From 6547efe7d4a4983ee486a747875a4cefefdf99a0 Mon Sep 17 00:00:00 2001 From: Christoph Sprunk Date: Sat, 6 Sep 2014 11:56:47 +0200 Subject: [PATCH 1/2] changing package.xml install location from /share/dynamicEDT3D/ to /share/dynamic_edt_3d to match catkin package name --- dynamicEDT3D/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt index b4a233ec..73736ccc 100644 --- a/dynamicEDT3D/CMakeLists.txt +++ b/dynamicEDT3D/CMakeLists.txt @@ -51,8 +51,8 @@ ADD_SUBDIRECTORY(src) file(GLOB dynamicEDT3D_HDRS ${PROJECT_SOURCE_DIR}/include/dynamicEDT3D/*.h ${PROJECT_SOURCE_DIR}/include/dynamicEDT3D/*.hxx) install(FILES ${dynamicEDT3D_HDRS} DESTINATION include/dynamicEDT3D) -# Install catkin package.xml -install(FILES package.xml DESTINATION share/dynamicEDT3D) +# Install catkin package.xml, attention package.xml names the catkin package "dynamic_edt_3d", so this is also the location where it needs to be installed to (and not "dynamicEDT3D") +install(FILES package.xml DESTINATION share/dynamic_edt_3d) #TODO: this conflicts with the octomap uninstall #it is not only a target name problem, also both will use the same manifest file From 5661fc8b213b2ffa955470ea8030419fd11cfb56 Mon Sep 17 00:00:00 2001 From: Christoph Sprunk Date: Sat, 6 Sep 2014 12:05:05 +0200 Subject: [PATCH 2/2] Version 1.6.8 release --- dynamicEDT3D/CHANGELOG.txt | 4 ++++ dynamicEDT3D/CMakeLists.txt | 2 +- dynamicEDT3D/package.xml | 2 +- octomap/CMakeLists.txt | 2 +- octomap/package.xml | 2 +- octovis/CMakeLists.txt | 2 +- octovis/package.xml | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dynamicEDT3D/CHANGELOG.txt b/dynamicEDT3D/CHANGELOG.txt index 965fdcb5..85e76ee1 100644 --- a/dynamicEDT3D/CHANGELOG.txt +++ b/dynamicEDT3D/CHANGELOG.txt @@ -1,3 +1,7 @@ +v1.6.8: 2014-09-06 +================== +- fixing package.xml installation location, now in /share/dynamic_edt_3d + v1.6.7: 2014-08-31 ================== - Support for SOVERSION in the library for better packaging diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt index 73736ccc..2debe960 100644 --- a/dynamicEDT3D/CMakeLists.txt +++ b/dynamicEDT3D/CMakeLists.txt @@ -6,7 +6,7 @@ ENABLE_TESTING() # version (e.g. for packaging) set(DYNAMICEDT3D_MAJOR_VERSION 1) set(DYNAMICEDT3D_MINOR_VERSION 6) -set(DYNAMICEDT3D_PATCH_VERSION 7) +set(DYNAMICEDT3D_PATCH_VERSION 8) set(DYNAMICEDT3D_VERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION}.${DYNAMICEDT3D_PATCH_VERSION}) set(DYNAMICEDT3D_SOVERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION}) diff --git a/dynamicEDT3D/package.xml b/dynamicEDT3D/package.xml index 7061533a..de5c0fdc 100644 --- a/dynamicEDT3D/package.xml +++ b/dynamicEDT3D/package.xml @@ -1,6 +1,6 @@ dynamic_edt_3d - 1.6.7 + 1.6.8 The dynamicEDT3D library implements an inrementally updatable Euclidean distance transform (EDT) in 3D. It comes with a wrapper to use the OctoMap 3D representation and hooks into the change detection of the OctoMap library to propagate changes to the EDT. Christoph Sprunk diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt index d968acf5..2547ca09 100644 --- a/octomap/CMakeLists.txt +++ b/octomap/CMakeLists.txt @@ -6,7 +6,7 @@ ENABLE_TESTING() # version (e.g. for packaging) set(OCTOMAP_MAJOR_VERSION 1) set(OCTOMAP_MINOR_VERSION 6) -set(OCTOMAP_PATCH_VERSION 7) +set(OCTOMAP_PATCH_VERSION 8) set(OCTOMAP_VERSION ${OCTOMAP_MAJOR_VERSION}.${OCTOMAP_MINOR_VERSION}.${OCTOMAP_PATCH_VERSION}) set(OCTOMAP_SOVERSION ${OCTOMAP_MAJOR_VERSION}.${OCTOMAP_MINOR_VERSION}) if(COMMAND cmake_policy) diff --git a/octomap/package.xml b/octomap/package.xml index 55670e4f..42803cff 100644 --- a/octomap/package.xml +++ b/octomap/package.xml @@ -1,6 +1,6 @@ octomap - 1.6.7 + 1.6.8 The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++. The map implementation is based on an octree. See http://octomap.github.io for details. diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt index 6e3888f0..d1c89e4c 100644 --- a/octovis/CMakeLists.txt +++ b/octovis/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT( octovis ) # # version (e.g. for packaging) set(OCTOVIS_MAJOR_VERSION 1) set(OCTOVIS_MINOR_VERSION 6) -set(OCTOVIS_PATCH_VERSION 7) +set(OCTOVIS_PATCH_VERSION 8) set(OCTOVIS_VERSION ${OCTOVIS_MAJOR_VERSION}.${OCTOVIS_MINOR_VERSION}.${OCTOVIS_PATCH_VERSION}) set(OCTOVIS_SOVERSION ${OCTOVIS_MAJOR_VERSION}.${OCTOVIS_MINOR_VERSION}) # get rid of a useless warning: diff --git a/octovis/package.xml b/octovis/package.xml index 45326ec1..819a6d26 100644 --- a/octovis/package.xml +++ b/octovis/package.xml @@ -1,6 +1,6 @@ octovis - 1.6.7 + 1.6.8 octovis is visualization tool for the OctoMap library based on Qt and libQGLViewer. See http://octomap.github.io for details.