From 57d2db5e5024fd2697f98177d6902f23dc27968e Mon Sep 17 00:00:00 2001 From: Pat Marion Date: Tue, 9 Feb 2016 10:44:30 -0500 Subject: [PATCH 1/7] remove qglviewer.h header dependency from some public headers Some octovis headers include qglviewer.h unnecessarily. By removing the header dependency it is easier to include octovis headers without requiring an include path for qglviewer. This commit could break user code that relies on the header, but those compile errors will be easy to fix. --- octovis/include/octovis/CameraFollowMode.h | 1 + octovis/include/octovis/SceneObject.h | 1 - octovis/include/octovis/ViewerSettingsPanel.h | 2 +- octovis/src/OcTreeDrawer.cpp | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/octovis/include/octovis/CameraFollowMode.h b/octovis/include/octovis/CameraFollowMode.h index cfed94af..a80516f5 100644 --- a/octovis/include/octovis/CameraFollowMode.h +++ b/octovis/include/octovis/CameraFollowMode.h @@ -26,6 +26,7 @@ #define CAMERAFOLLOWMODE_H_ #include "SceneObject.h" +#include class CameraFollowMode : public QObject { Q_OBJECT diff --git a/octovis/include/octovis/SceneObject.h b/octovis/include/octovis/SceneObject.h index 09517ba3..7005d969 100644 --- a/octovis/include/octovis/SceneObject.h +++ b/octovis/include/octovis/SceneObject.h @@ -37,7 +37,6 @@ #include #endif -#include #include namespace octomap { diff --git a/octovis/include/octovis/ViewerSettingsPanel.h b/octovis/include/octovis/ViewerSettingsPanel.h index 03c3987d..dd694be7 100644 --- a/octovis/include/octovis/ViewerSettingsPanel.h +++ b/octovis/include/octovis/ViewerSettingsPanel.h @@ -26,7 +26,7 @@ #define VIEWERSETTINGSPANEL_H #include -#include +#include #include "ui_ViewerSettingsPanel.h" #define _TREE_MAX_DEPTH 16 diff --git a/octovis/src/OcTreeDrawer.cpp b/octovis/src/OcTreeDrawer.cpp index b825ca9e..77d4d8ea 100644 --- a/octovis/src/OcTreeDrawer.cpp +++ b/octovis/src/OcTreeDrawer.cpp @@ -23,6 +23,7 @@ */ #include +#include #define OTD_RAD2DEG 57.2957795 From 27092e2f3cf58ed91dfb58ef77a03da70b64a92a Mon Sep 17 00:00:00 2001 From: Armin Hornung Date: Wed, 23 Mar 2016 21:46:06 +0100 Subject: [PATCH 2/7] Fix #109: BBX-iterator on empty tree --- octomap/include/octomap/OcTreeIterator.hxx | 25 ++++++++++++---------- octomap/src/testing/test_iterators.cpp | 15 +++++++++++++ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/octomap/include/octomap/OcTreeIterator.hxx b/octomap/include/octomap/OcTreeIterator.hxx index 6a2fd5ed..3d06eec9 100644 --- a/octomap/include/octomap/OcTreeIterator.hxx +++ b/octomap/include/octomap/OcTreeIterator.hxx @@ -64,7 +64,8 @@ s.depth = 0; s.key[0] = s.key[1] = s.key[2] = tree->tree_max_val; stack.push(s); - } else{ // construct the same as "end", tree must already be NULL + } else{ // construct the same as "end" + tree = NULL; this->maxDepth = 0; } } @@ -349,16 +350,18 @@ leaf_bbx_iterator(OcTreeBaseImpl const* tree, const point3d& min, const point3d& max, unsigned char depth=0) : iterator_base(tree, depth) { - - if (!this->tree->coordToKeyChecked(min, minKey) || !this->tree->coordToKeyChecked(max, maxKey)){ - // coordinates invalid, set to end iterator - tree = NULL; - this->maxDepth = 0; - } else{ // else: keys are generated and stored - - // advance from root to next valid leaf in bbx: - this->stack.push(this->stack.top()); - this->operator ++(); + if (this->stack.size() > 0){ + assert(tree); + if (!this->tree->coordToKeyChecked(min, minKey) || !this->tree->coordToKeyChecked(max, maxKey)){ + // coordinates invalid, set to end iterator + tree = NULL; + this->maxDepth = 0; + } else{ // else: keys are generated and stored + + // advance from root to next valid leaf in bbx: + this->stack.push(this->stack.top()); + this->operator ++(); + } } } diff --git a/octomap/src/testing/test_iterators.cpp b/octomap/src/testing/test_iterators.cpp index a2b77c19..4aab1869 100644 --- a/octomap/src/testing/test_iterators.cpp +++ b/octomap/src/testing/test_iterators.cpp @@ -256,6 +256,21 @@ int main(int argc, char** argv) { iteratedNodes++; } EXPECT_EQ(iteratedNodes, 0); + + octomap::point3d ptMinBBX(-0.1, -0.1, -0.1); + octomap::point3d ptMaxBBX(0.1, 0.1, 0.1); + for(OcTree::leaf_bbx_iterator l_it = emptyTree.begin_leafs_bbx(ptMinBBX, ptMaxBBX, maxDepth), l_end=emptyTree.end_leafs_bbx(); l_it!= l_end; ++l_it){ + iteratedNodes++; + } + EXPECT_EQ(iteratedNodes, 0); + + octomap::OcTreeKey minBBX(10, 10, 16); + octomap::OcTreeKey maxBBX(10, 10, 18); + for(OcTree::leaf_bbx_iterator l_it = emptyTree.begin_leafs_bbx(minBBX, maxBBX, maxDepth), l_end=emptyTree.end_leafs_bbx(); l_it!= l_end; ++l_it){ + iteratedNodes++; + } + EXPECT_EQ(iteratedNodes, 0); + From 3ac98747b2243633dba0dbaa8585f1b5ba90a2c9 Mon Sep 17 00:00:00 2001 From: Armin Hornung Date: Wed, 23 Mar 2016 21:55:43 +0100 Subject: [PATCH 3/7] Cleanup of OcTreeKey arguments (const refs) --- octomap/include/octomap/OcTreeKey.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/octomap/include/octomap/OcTreeKey.h b/octomap/include/octomap/OcTreeKey.h index 56269fdc..8e330426 100644 --- a/octomap/include/octomap/OcTreeKey.h +++ b/octomap/include/octomap/OcTreeKey.h @@ -77,7 +77,7 @@ namespace octomap { bool operator== (const OcTreeKey &other) const { return ((k[0] == other[0]) && (k[1] == other[1]) && (k[2] == other[2])); } - bool operator!= (const OcTreeKey &other) const { + bool operator!= (const OcTreeKey& other) const { return( (k[0] != other[0]) || (k[1] != other[1]) || (k[2] != other[2]) ); } OcTreeKey& operator=(const OcTreeKey& other){ @@ -131,7 +131,7 @@ namespace octomap { void reset() { end_of_ray = begin(); } - void addKey(OcTreeKey& k) { + void addKey(const OcTreeKey& k) { assert(end_of_ray != ray.end()); *end_of_ray = k; end_of_ray++; @@ -167,7 +167,7 @@ namespace octomap { * @param[in] parent_key current (parent) key * @param[out] child_key computed child key */ - inline void computeChildKey (const unsigned int& pos, const unsigned short int& center_offset_key, + inline void computeChildKey (unsigned int pos, unsigned short int center_offset_key, const OcTreeKey& parent_key, OcTreeKey& child_key) { // x-axis if (pos & 1) child_key[0] = parent_key[0] + center_offset_key; From ed78af28e2398f5f5115ac5384767b24d0681153 Mon Sep 17 00:00:00 2001 From: Armin Hornung Date: Fri, 25 Mar 2016 22:19:38 +0100 Subject: [PATCH 4/7] Fix QGLViewer library names for Ubuntu wily and xenial, make QGLViewer linking more robust using full paths --- octovis/CMakeModules/FindQGLViewer.cmake | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/octovis/CMakeModules/FindQGLViewer.cmake b/octovis/CMakeModules/FindQGLViewer.cmake index 2e9b64cc..ab060b1b 100644 --- a/octovis/CMakeModules/FindQGLViewer.cmake +++ b/octovis/CMakeModules/FindQGLViewer.cmake @@ -23,7 +23,7 @@ FIND_PATH( QGLViewer_INCLUDE_DIR qglviewer.h ${QGLVIEWER_BASE_DIR} ) -FIND_LIBRARY( QGLViewer_LIBRARY_DIR_UBUNTU qglviewer-qt4 ) +FIND_LIBRARY( QGLViewer_LIBRARY_DIR_UBUNTU NAMES qglviewer-qt4 QGLViewer-qt4) FIND_LIBRARY( QGLViewer_LIBRARY_DIR_WINDOWS QGLViewer2 ${QGLVIEWER_BASE_DIR}) FIND_LIBRARY( QGLViewer_LIBRARY_DIR_OTHER QGLViewer ${QGLVIEWER_BASE_DIR}) @@ -33,22 +33,16 @@ IF( QGLViewer_INCLUDE_DIR ) MESSAGE(STATUS "QGLViewer includes found in ${QGLViewer_INCLUDE_DIR}") IF (QGLViewer_LIBRARY_DIR_UBUNTU) - MESSAGE(STATUS "qglviewer-qt4 found in ${QGLViewer_LIBRARY_DIR_UBUNTU}") - # strip filename from path - GET_FILENAME_COMPONENT( QGLViewer_LIBRARY_DIR ${QGLViewer_LIBRARY_DIR_UBUNTU} PATH CACHE ) - SET( QGLViewer_LIBRARIES qglviewer-qt4) + MESSAGE(STATUS "QGLViewer library found in ${QGLViewer_LIBRARY_DIR_UBUNTU}") + SET( QGLViewer_LIBRARIES ${QGLViewer_LIBRARY_DIR_UBUNTU}) SET( QGLViewer_FOUND 1 CACHE BOOL "Do we have QGLViewer?" FORCE ) ELSEIF(QGLViewer_LIBRARY_DIR_WINDOWS) - # strip filename from path - GET_FILENAME_COMPONENT( QGLViewer_LIBRARY_DIR ${QGLViewer_LIBRARY_DIR_WINDOWS} PATH CACHE ) - SET( QGLViewer_LIBRARIES QGLViewer2) + MESSAGE(STATUS "QGLViewer2 found in ${QGLViewer_LIBRARY_DIR_WINDOWS}") + SET( QGLViewer_LIBRARIES ${QGLViewer_LIBRARY_DIR_WINDOWS}) SET( QGLViewer_FOUND 1 CACHE BOOL "Do we have QGLViewer?" FORCE ) - MESSAGE(STATUS "QGLViewer2.lib found in ${QGLViewer_LIBRARY_DIR}") ELSEIF(QGLViewer_LIBRARY_DIR_OTHER) - MESSAGE(STATUS "QGLViewer found: ${QGLViewer_LIBRARY_DIR_OTHER}") - # strip filename from path - GET_FILENAME_COMPONENT( QGLViewer_LIBRARY_DIR ${QGLViewer_LIBRARY_DIR_OTHER} PATH CACHE ) - SET( QGLViewer_LIBRARIES QGLViewer) + MESSAGE(STATUS "QGLViewer found in ${QGLViewer_LIBRARY_DIR_OTHER}") + SET( QGLViewer_LIBRARIES ${QGLViewer_LIBRARY_DIR_OTHER}) SET( QGLViewer_FOUND 1 CACHE BOOL "Do we have QGLViewer?" FORCE ) ELSE() MESSAGE(STATUS "QGLViewer library not found.") From ef727e86648a824ae5654ff8d0c209a9b7923930 Mon Sep 17 00:00:00 2001 From: Armin Hornung Date: Sat, 26 Mar 2016 14:09:01 +0100 Subject: [PATCH 5/7] Fix install path in CMakeConfigs (Followup on #47) --- dynamicEDT3D/CMakeLists.txt | 4 ++-- dynamicEDT3D/dynamicEDT3DConfig.cmake.in | 2 +- octomap/CMakeLists.txt | 9 +++++---- octomap/octomap-config.cmake.in | 4 ++-- octovis/CMakeLists.txt | 4 ++-- octovis/octovis-config.cmake.in | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt index 6b7c46b7..96f6ea1c 100644 --- a/dynamicEDT3D/CMakeLists.txt +++ b/dynamicEDT3D/CMakeLists.txt @@ -84,11 +84,11 @@ set(DYNAMICEDT3D_LIB_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") # Windows, spec. MSVC requires the .lib suffix for imported libs IF(WIN32) set(DYNAMICEDT3D_LIBRARY - "${DYNAMICEDT3D_LIB_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}dynamicedt3d${CMAKE_IMPORT_LIBRARY_SUFFIX}" + "${CMAKE_IMPORT_LIBRARY_PREFIX}dynamicedt3d${CMAKE_IMPORT_LIBRARY_SUFFIX}" ) ELSE() set(DYNAMICEDT3D_LIBRARY - "${DYNAMICEDT3D_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}dynamicedt3d${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CMAKE_SHARED_LIBRARY_PREFIX}dynamicedt3d${CMAKE_SHARED_LIBRARY_SUFFIX}" ) ENDIF() # not used right now (export depends?) diff --git a/dynamicEDT3D/dynamicEDT3DConfig.cmake.in b/dynamicEDT3D/dynamicEDT3DConfig.cmake.in index cc5fb4e5..9cd3df84 100644 --- a/dynamicEDT3D/dynamicEDT3DConfig.cmake.in +++ b/dynamicEDT3D/dynamicEDT3DConfig.cmake.in @@ -20,4 +20,4 @@ set(DYNAMICEDT3D_LIBRARY_DIRS "@DYNAMICEDT3D_LIB_DIR@") # Our library dependencies (contains definitions for IMPORTED targets) # include("@FOOBAR_CMAKE_DIR@/FooBarLibraryDepends.cmake") -set(DYNAMICEDT3D_LIBRARIES "@DYNAMICEDT3D_LIBRARY@") +set(DYNAMICEDT3D_LIBRARIES "@DYNAMICEDT3D_LIB_DIR@/@DYNAMICEDT3D_LIBRARY@") diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt index d9f23114..9e529c90 100644 --- a/octomap/CMakeLists.txt +++ b/octomap/CMakeLists.txt @@ -87,17 +87,17 @@ set(OCTOMAP_LIB_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") # Windows, spec. MSVC requires the .lib suffix for imported libs IF(WIN32) set(OCTOMAP_LIBRARY - "${OCTOMAP_LIB_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}octomap${CMAKE_IMPORT_LIBRARY_SUFFIX}" + "${CMAKE_IMPORT_LIBRARY_PREFIX}octomap${CMAKE_IMPORT_LIBRARY_SUFFIX}" ) set(OCTOMATH_LIBRARY - "${OCTOMAP_LIB_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}octomath${CMAKE_IMPORT_LIBRARY_SUFFIX}" + "${CMAKE_IMPORT_LIBRARY_PREFIX}octomath${CMAKE_IMPORT_LIBRARY_SUFFIX}" ) ELSE() set(OCTOMAP_LIBRARY - "${OCTOMAP_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}octomap${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CMAKE_SHARED_LIBRARY_PREFIX}octomap${CMAKE_SHARED_LIBRARY_SUFFIX}" ) set(OCTOMATH_LIBRARY - "${OCTOMAP_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}octomath${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CMAKE_SHARED_LIBRARY_PREFIX}octomath${CMAKE_SHARED_LIBRARY_SUFFIX}" ) ENDIF() @@ -114,6 +114,7 @@ configure_file(octomap-config-version.cmake.in set(OCTOMAP_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include") set(OCTOMAP_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") #set(OCTOMAP_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake") + configure_file(octomap-config.cmake.in "${PROJECT_BINARY_DIR}/InstallFiles/octomap-config.cmake" @ONLY) configure_file(octomap-config-version.cmake.in diff --git a/octomap/octomap-config.cmake.in b/octomap/octomap-config.cmake.in index 9dd1f96a..2f5ba8c5 100644 --- a/octomap/octomap-config.cmake.in +++ b/octomap/octomap-config.cmake.in @@ -29,6 +29,6 @@ set(OCTOMAP_LIBRARY_DIRS "@OCTOMAP_LIB_DIR@") # Set library names set(OCTOMAP_LIBRARIES - "@OCTOMAP_LIBRARY@" - "@OCTOMATH_LIBRARY@" + "@OCTOMAP_LIB_DIR@/@OCTOMAP_LIBRARY@" + "@OCTOMAP_LIB_DIR@/@OCTOMATH_LIBRARY@" ) diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt index 4ba703a8..1154b2fa 100644 --- a/octovis/CMakeLists.txt +++ b/octovis/CMakeLists.txt @@ -90,11 +90,11 @@ IF(BUILD_VIEWER) # Windows, spec. MSVC requires the .lib suffix for imported libs IF(WIN32) set(OCTOVIS_LIBRARY - "${OCTOVIS_LIB_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}octovis${CMAKE_IMPORT_LIBRARY_SUFFIX}" + "${CMAKE_IMPORT_LIBRARY_PREFIX}octovis${CMAKE_IMPORT_LIBRARY_SUFFIX}" ) ELSE() set(OCTOVIS_LIBRARY - "${OCTOVIS_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}octovis${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CMAKE_SHARED_LIBRARY_PREFIX}octovis${CMAKE_SHARED_LIBRARY_SUFFIX}" ) ENDIF() diff --git a/octovis/octovis-config.cmake.in b/octovis/octovis-config.cmake.in index 3f7cc6ae..89425d5d 100644 --- a/octovis/octovis-config.cmake.in +++ b/octovis/octovis-config.cmake.in @@ -13,5 +13,5 @@ set(OCTOVIS_LIBRARY_DIRS "@QGLViewer_LIBRARY_DIR@" "@OCTOVIS_LIB_DIR@") set(OCTOVIS_LIBRARIES "@QGLViewer_LIBRARIES@" "@QT_LIBRARIES@" - "@OCTOVIS_LIBRARY@" + "@OCTOVIS_LIB_DIR@/@OCTOVIS_LIBRARY@" ) From 355bf13329178f88286b914421ef30e2d3becfd6 Mon Sep 17 00:00:00 2001 From: Armin Hornung Date: Sat, 26 Mar 2016 14:27:34 +0100 Subject: [PATCH 6/7] Make QGLViewer compilation error more descriptive --- octovis/CMakeModules/FindQGLViewer.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octovis/CMakeModules/FindQGLViewer.cmake b/octovis/CMakeModules/FindQGLViewer.cmake index ab060b1b..752002b9 100644 --- a/octovis/CMakeModules/FindQGLViewer.cmake +++ b/octovis/CMakeModules/FindQGLViewer.cmake @@ -104,7 +104,7 @@ IF (NOT QGLViewer_FOUND) #FIND_LIBRARY(QGLViewer_LIBRARY_DIR_OTHER QGLViewer ${QGLVIEWER_BASE_DIR}) FIND_PATH(QGLLIB libQGLViewer.so ${QGLVIEWER_BASE_DIR}) IF (NOT QGLLIB) - MESSAGE(STATUS "\nfailed to build libQGLViewer") + MESSAGE(WARNING "Could not find libQGLViewer.so, failed to build?") SET( QGLViewer_FOUND 0 CACHE BOOL "Do we have QGLViewer?" FORCE ) ELSE() MESSAGE(STATUS "Successfully built library in:\n${QGLLIB}") From bb8570e43984e7e541d82f33ea65c8db71b22a15 Mon Sep 17 00:00:00 2001 From: Armin Hornung Date: Sat, 26 Mar 2016 14:39:27 +0100 Subject: [PATCH 7/7] Version 1.7.2 release --- dynamicEDT3D/CMakeLists.txt | 2 +- dynamicEDT3D/package.xml | 2 +- octomap/CHANGELOG.txt | 7 +++++++ octomap/CMakeLists.txt | 2 +- octomap/package.xml | 2 +- octovis/CMakeLists.txt | 2 +- octovis/package.xml | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt index 96f6ea1c..57b07b6c 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 7) -set(DYNAMICEDT3D_PATCH_VERSION 1) +set(DYNAMICEDT3D_PATCH_VERSION 2) 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 ec3e9501..5f96c240 100644 --- a/dynamicEDT3D/package.xml +++ b/dynamicEDT3D/package.xml @@ -1,6 +1,6 @@ dynamic_edt_3d - 1.7.1 + 1.7.2 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/CHANGELOG.txt b/octomap/CHANGELOG.txt index d0ef4301..9e42cbd6 100644 --- a/octomap/CHANGELOG.txt +++ b/octomap/CHANGELOG.txt @@ -1,3 +1,10 @@ +v1.7.2: 2016-03-26 +================== +- BBX iterators fixed for empty trees (point3d version) +- Removed qglviewer.h from some public octovis headers +- Fixed QGLViewer library names for Ubuntu wily and xenial +- Fixed install path in CMakeConfigs + v1.7.1: 2016-01-31 ================== - Fixed #82: Enable uninstall target for complete project diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt index 9e529c90..7cf1bee7 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 7) -set(OCTOMAP_PATCH_VERSION 1) +set(OCTOMAP_PATCH_VERSION 2) 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 1d3a6491..f09af15b 100644 --- a/octomap/package.xml +++ b/octomap/package.xml @@ -1,6 +1,6 @@ octomap - 1.7.1 + 1.7.2 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 1154b2fa..46cf8469 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 7) -set(OCTOVIS_PATCH_VERSION 1) +set(OCTOVIS_PATCH_VERSION 2) 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 408570c6..b8cdaa9e 100644 --- a/octovis/package.xml +++ b/octovis/package.xml @@ -1,6 +1,6 @@ octovis - 1.7.1 + 1.7.2 octovis is visualization tool for the OctoMap library based on Qt and libQGLViewer. See http://octomap.github.io for details.