Skip to content

Commit

Permalink
Fixed warning with vtk 7.1. Dont add target "uninstall" if already ad…
Browse files Browse the repository at this point in the history
…ded from some cmake dependencies
  • Loading branch information
matlabbe committed Jan 4, 2024
1 parent 096592e commit 79db6b2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ option(WITH_REALSENSE2 "Include RealSense support" ON)
option(WITH_MYNTEYE "Include mynteye-s support" ON)
option(WITH_DEPTHAI "Include depthai-core support" OFF)
option(WITH_OCTOMAP "Include OctoMap support" ON)
option(WITH_GRIDMAP "Include GridMap support" OFF)
option(WITH_GRIDMAP "Include GridMap support" ON)
option(WITH_CPUTSDF "Include CPUTSDF support" OFF)
option(WITH_OPENCHISEL "Include open_chisel support" OFF)
option(WITH_ALICE_VISION "Include AliceVision support" OFF)
Expand Down Expand Up @@ -1083,13 +1083,15 @@ ENDIF(BUILD_EXAMPLES)
#######################
# Uninstall target, for "make uninstall"
#######################
IF (NOT TARGET uninstall)
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)

ADD_CUSTOM_TARGET(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
ENDIF()

####
# Global Export Target
Expand Down
2 changes: 1 addition & 1 deletion guilib/src/CloudViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1679,7 +1679,7 @@ bool CloudViewer::addElevationMap(
color[j] = 255 * dcolor[j] / 1.0;
}

#if VTK_MAJOR_VERSION > 7
#if VTK_MAJOR_VERSION > 7 || (VTK_MAJOR_VERSION==7 && VTK_MINOR_VERSION >= 1)
colors->InsertNextTypedTuple(color);
#else
colors->InsertNextTupleValue(color);
Expand Down

0 comments on commit 79db6b2

Please sign in to comment.