Fixed build errors without octomap

This commit is contained in:
matlabbe
2016-07-17 21:36:54 -04:00
parent cf2bb6b599
commit be61eefdf9
3 changed files with 4 additions and 9 deletions
+1 -1
View File
@@ -286,7 +286,7 @@ IF(WITH_ZED)
ENDIF(WITH_ZED) ENDIF(WITH_ZED)
IF(WITH_OCTOMAP) IF(WITH_OCTOMAP)
FIND_PACKAGE(OCTOMAP) FIND_PACKAGE(OCTOMAP QUIET)
IF(OCTOMAP_FOUND) IF(OCTOMAP_FOUND)
MESSAGE(STATUS "Found octomap: ${OCTOMAP_INCLUDE_DIRS}") MESSAGE(STATUS "Found octomap: ${OCTOMAP_INCLUDE_DIRS}")
ENDIF(OCTOMAP_FOUND) ENDIF(OCTOMAP_FOUND)
+1 -1
View File
@@ -739,8 +739,8 @@ bool CloudViewer::addOctomap(const OctoMap * octomap, unsigned int treeDepth, bo
_octomapActor = octomapActor.GetPointer(); _octomapActor = octomapActor.GetPointer();
return true; return true;
#endif
} }
#endif
return false; return false;
} }
+2 -7
View File
@@ -154,13 +154,8 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) :
#endif #endif
#ifndef RTABMAP_OCTOMAP #ifndef RTABMAP_OCTOMAP
_ui->checkBox_octomap->setChecked(false); _ui->groupBox_octomap->setChecked(false);
_ui->checkBox_octomap->setEnabled(false); _ui->groupBox_octomap->setEnabled(false);
_ui->label_octomap->setEnabled(false);
_ui->spinBox_octomap_treeDepth->setEnabled(false);
_ui->label_octomap_treeDepth->setEnabled(false);
_ui->checkBox_octomap_groundObstacle->setEnabled(false);
_ui->label_octomap_groundObstacle->setEnabled(false);
#endif #endif
#ifndef RTABMAP_NONFREE #ifndef RTABMAP_NONFREE