mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-02 09:30:25 +08:00
CMake: added explicit opencv modules to avoid VTK6-VTK7 issues on Focal (vtk6 dependency coming with opencv_viz 4.2 module and vtk7 coming from PCL)
This commit is contained in:
@@ -221,7 +221,7 @@ ENDIF()
|
|||||||
set(RTABMAP_QT_VERSION AUTO CACHE STRING "Force a specific Qt version.")
|
set(RTABMAP_QT_VERSION AUTO CACHE STRING "Force a specific Qt version.")
|
||||||
set_property(CACHE RTABMAP_QT_VERSION PROPERTY STRINGS AUTO 4 5)
|
set_property(CACHE RTABMAP_QT_VERSION PROPERTY STRINGS AUTO 4 5)
|
||||||
|
|
||||||
FIND_PACKAGE(OpenCV REQUIRED QUIET)
|
FIND_PACKAGE(OpenCV REQUIRED QUIET COMPONENTS core calib3d imgproc highgui stitching optflow photo OPTIONAL_COMPONENTS aruco xfeatures2d nonfree gpu cudafeatures2d)
|
||||||
|
|
||||||
IF(WITH_QT)
|
IF(WITH_QT)
|
||||||
FIND_PACKAGE(PCL 1.7 REQUIRED QUIET COMPONENTS common io kdtree search surface filters registration sample_consensus segmentation visualization)
|
FIND_PACKAGE(PCL 1.7 REQUIRED QUIET COMPONENTS common io kdtree search surface filters registration sample_consensus segmentation visualization)
|
||||||
|
|||||||
@@ -55,10 +55,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#include "gtsam/GPSPose3XYZFactor.h"
|
#include "gtsam/GPSPose3XYZFactor.h"
|
||||||
|
|
||||||
#ifdef RTABMAP_VERTIGO
|
#ifdef RTABMAP_VERTIGO
|
||||||
#include "vertigo/gtsam/betweenFactorMaxMix.h"
|
|
||||||
#include "vertigo/gtsam/betweenFactorSwitchable.h"
|
#include "vertigo/gtsam/betweenFactorSwitchable.h"
|
||||||
#include "vertigo/gtsam/switchVariableLinear.h"
|
#include "vertigo/gtsam/switchVariableLinear.h"
|
||||||
#include "vertigo/gtsam/switchVariableSigmoid.h"
|
|
||||||
#endif
|
#endif
|
||||||
#endif // end RTABMAP_GTSAM
|
#endif // end RTABMAP_GTSAM
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user