From 30f445642e55b7b72aa46ec5d64ec253c8607859 Mon Sep 17 00:00:00 2001 From: Anasarrak Date: Wed, 3 Jul 2019 10:45:21 +0200 Subject: [PATCH 1/9] Change octomap CMakelists cmake_minimum_required version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1ec836e..2d8cabeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) PROJECT( octomap-distribution ) ENABLE_TESTING() # enable CTest environment of subprojects From d9277b74adf20a0c6c3dbf25a3b99db96b70718b Mon Sep 17 00:00:00 2001 From: Anasarrak Date: Wed, 3 Jul 2019 10:46:21 +0200 Subject: [PATCH 2/9] Update dynamicEDT3D to build with ament_cmake --- dynamicEDT3D/CMakeLists.txt | 2 +- dynamicEDT3D/package.xml | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt index ed8d2f55..0bfa88a0 100644 --- a/dynamicEDT3D/CMakeLists.txt +++ b/dynamicEDT3D/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) PROJECT(dynamicEDT3D) include(CTest) diff --git a/dynamicEDT3D/package.xml b/dynamicEDT3D/package.xml index bb2a636e..6389e4ac 100644 --- a/dynamicEDT3D/package.xml +++ b/dynamicEDT3D/package.xml @@ -1,4 +1,4 @@ - + dynamic_edt_3d 1.9.0 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. @@ -10,16 +10,12 @@ http://octomap.github.io https://github.com/OctoMap/octomap/issues - octomap + ament_cmake - octomap - catkin + octomap - cmake - - - cmake + ament_cmake - + From ae9e0ae45304f4d3d317cd455bd918f154401d8e Mon Sep 17 00:00:00 2001 From: Anasarrak Date: Wed, 3 Jul 2019 10:46:36 +0200 Subject: [PATCH 3/9] Update octomap to build with ament_cmake --- octomap/CMakeLists.txt | 2 +- octomap/package.xml | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt index 50e6323f..7e749345 100644 --- a/octomap/CMakeLists.txt +++ b/octomap/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) PROJECT( octomap ) include(CTest) diff --git a/octomap/package.xml b/octomap/package.xml index 28ffe778..a74c3373 100644 --- a/octomap/package.xml +++ b/octomap/package.xml @@ -11,12 +11,11 @@ http://octomap.github.io https://github.com/OctoMap/octomap/issues - - catkin - cmake - + + ament_cmake + - cmake + ament_cmake - + From f7b016653090add43ab7e2d576ea43f23d580976 Mon Sep 17 00:00:00 2001 From: Anasarrak Date: Wed, 3 Jul 2019 10:47:03 +0200 Subject: [PATCH 4/9] Update octovis to build with ament_cmake --- octovis/CMakeLists.txt | 2 +- octovis/package.xml | 25 +++++++++---------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt index 61490d9a..0e3e1ac7 100644 --- a/octovis/CMakeLists.txt +++ b/octovis/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) PROJECT( octovis ) include(CTest) diff --git a/octovis/package.xml b/octovis/package.xml index c95b9e80..802d3684 100644 --- a/octovis/package.xml +++ b/octovis/package.xml @@ -11,23 +11,16 @@ http://octomap.github.io https://github.com/OctoMap/octomap/issues - - catkin - cmake - + ament_cmake + + octomap + libqglviewer-qt4-dev + libqt4-dev + libqt4-opengl-dev + - cmake + ament_cmake - - octomap - libqglviewer-qt4-dev - libqt4-dev - libqt4-opengl-dev - - octomap - libqglviewer-qt4 - libqtgui4 - libqt4-opengl - + From c16ef89f9bcc197480346e2f2206ce807c4d8970 Mon Sep 17 00:00:00 2001 From: Anasarrak Date: Wed, 3 Jul 2019 11:32:18 +0200 Subject: [PATCH 5/9] Add package.xml version to 3 --- octomap/package.xml | 2 +- octovis/package.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/octomap/package.xml b/octomap/package.xml index a74c3373..3e4dd498 100644 --- a/octomap/package.xml +++ b/octomap/package.xml @@ -1,4 +1,4 @@ - + octomap 1.9.0 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 diff --git a/octovis/package.xml b/octovis/package.xml index 802d3684..555c1081 100644 --- a/octovis/package.xml +++ b/octovis/package.xml @@ -1,4 +1,4 @@ - + octovis 1.9.0 octovis is visualization tool for the OctoMap library based on Qt and libQGLViewer. See From 8915700829691f308d20344bc194c63c60b4949f Mon Sep 17 00:00:00 2001 From: maleicacid Date: Thu, 4 Jul 2019 13:59:17 +0900 Subject: [PATCH 6/9] Compatible with Qt5 & QGLViewer-qt5 --- CMakeLists.txt | 2 +- octovis/CMakeModules/FindQGLViewer.cmake | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d8cabeb..c39663c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) # enables -fPIC in applicable compilers option(BUILD_OCTOVIS_SUBPROJECT "Build targets from subproject octovis" ON) option(BUILD_DYNAMICETD3D_SUBPROJECT "Build targets from subproject dynamicEDT3D" ON) -option(OCTOVIS_QT5 "Link Octovis against Qt5?" NO) +option(OCTOVIS_QT5 "Link Octovis against Qt5?" ON) if(OCTOVIS_QT5) # Compiling against QT5 requires C++11. diff --git a/octovis/CMakeModules/FindQGLViewer.cmake b/octovis/CMakeModules/FindQGLViewer.cmake index 752002b9..4e2b1820 100644 --- a/octovis/CMakeModules/FindQGLViewer.cmake +++ b/octovis/CMakeModules/FindQGLViewer.cmake @@ -22,8 +22,11 @@ FIND_PATH( QGLViewer_INCLUDE_DIR qglviewer.h /opt/local/include/QGLViewer ${QGLVIEWER_BASE_DIR} ) - +if(QT4_FOUND) FIND_LIBRARY( QGLViewer_LIBRARY_DIR_UBUNTU NAMES qglviewer-qt4 QGLViewer-qt4) +else() +FIND_LIBRARY( QGLViewer_LIBRARY_DIR_UBUNTU NAMES qglviewer-qt5 QGLViewer-qt5) +endif() FIND_LIBRARY( QGLViewer_LIBRARY_DIR_WINDOWS QGLViewer2 ${QGLVIEWER_BASE_DIR}) FIND_LIBRARY( QGLViewer_LIBRARY_DIR_OTHER QGLViewer ${QGLVIEWER_BASE_DIR}) @@ -119,4 +122,4 @@ ENDIF() # You need to use qmake of QT4. You are using QT3 if you get: #CMakeFiles/octovis.dir/ViewerWidget.cpp.o: In function `octomap::ViewerWidget::ViewerWidget(QWidget*)': -#ViewerWidget.cpp:(.text+0x1715): undefined reference to `QGLViewer::QGLViewer(QWidget*, QGLWidget const*, QFlags)' \ No newline at end of file +#ViewerWidget.cpp:(.text+0x1715): undefined reference to `QGLViewer::QGLViewer(QWidget*, QGLWidget const*, QFlags)' From c1a1157e009b124f894e247a1efe982d35bbf64b Mon Sep 17 00:00:00 2001 From: Anas Mchichou El Harrak Date: Wed, 10 Jul 2019 14:27:49 +0200 Subject: [PATCH 7/9] Octovis, Add libqt5 dependencies on the package.xml --- octovis/package.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/octovis/package.xml b/octovis/package.xml index 555c1081..b521d13c 100644 --- a/octovis/package.xml +++ b/octovis/package.xml @@ -19,6 +19,10 @@ libqt4-dev libqt4-opengl-dev + libqglviewer-dev-qt5 + qtbase5-dev + libqt5opengl5-dev + ament_cmake From 2ba59ab81501ffc413c502808e4f282107f612d1 Mon Sep 17 00:00:00 2001 From: anasarrak Date: Thu, 11 Jul 2019 08:43:24 +0000 Subject: [PATCH 8/9] Remove not necessary lib from package.xml --- octovis/package.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/octovis/package.xml b/octovis/package.xml index 80e5efec..eea1173b 100644 --- a/octovis/package.xml +++ b/octovis/package.xml @@ -19,9 +19,7 @@ libqt4-dev libqt4-opengl-dev - libqglviewer-dev-qt5 qtbase5-dev - libqt5opengl5-dev ament_cmake From 14ba98c4b8ab2c91cb80e2fea5862ccf7c85fd5e Mon Sep 17 00:00:00 2001 From: Anasarrak Date: Thu, 11 Jul 2019 13:19:48 +0200 Subject: [PATCH 9/9] Add libqt5-core to octovis package.xml --- octovis/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/octovis/package.xml b/octovis/package.xml index eea1173b..ddc78b7b 100644 --- a/octovis/package.xml +++ b/octovis/package.xml @@ -20,6 +20,7 @@ libqt4-opengl-dev qtbase5-dev + libqt5-core ament_cmake