Merge branch 'devel'

OctoMap · Sep 6, 2014 · 17c3faf · 17c3faf
2 parents 0cc56b4 + 5661fc8
commit 17c3faf
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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})
 
@@ -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

diff --git a/dynamicEDT3D/package.xml b/dynamicEDT3D/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>dynamic_edt_3d</name>
-  <version>1.6.7</version>
+  <version>1.6.8</version>
   <description> 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.</description>
 
   <author email="sprunkc@informatik.uni-freiburg.de">Christoph Sprunk</author>

diff --git 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
@@ -1,6 +1,6 @@
 <package>
   <name>octomap</name>
-  <version>1.6.7</version>
+  <version>1.6.8</version>
   <description>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.</description>
 

diff --git 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
@@ -1,6 +1,6 @@
 <package>
   <name>octovis</name>
-  <version>1.6.7</version>
+  <version>1.6.8</version>
   <description>octovis is visualization tool for the OctoMap library based on Qt and libQGLViewer. See
   http://octomap.github.io for details.</description>