Merge branch 'feat/useSuperbuildPVSBBased' into 'master'

[feat] Rework lidarview superbuild

See merge request !156

.gitlab-ci.yml

@@ -5,10 +5,10 @@ variables:
     value: '-DENABLE_nanoflann=True'
   sb_cmake_option_ENABLE_pcl:
     value: '-DENABLE_pcl=True'
-  sb_cmake_option_INTERPRETER_ENABLE_Hesai:
-    value: '-DINTERPRETER_ENABLE_Hesai=True'
-  sb_cmake_option_LIDARVIEW_BUILD_SLAM:
-    value: '-DLIDARVIEW_BUILD_SLAM=True'
+  sb_cmake_option_ENABLE_INTERPRETER_HESAI:
+    value: '-DINTERPRETER_ENABLE_INTERPRETER_HESAI=True'
+  sb_cmake_option_LIDARVIEW_ENABLE_SLAM:
+    value: '-DLIDARVIEW_ENABLE_SLAM=True'
 include:
   - project: 'LidarView/lidarview-core'
     file: 'CI/.gitlab-ci-for-lidarview.yml'

.gitmodules

-[submodule "Superbuild/lidarview-superbuild"]
-	path = Superbuild/lidarview-superbuild
-	url = https://gitlab.kitware.com/LidarView/lidarview-superbuild.git
 [submodule "LVCore"]
 	path = LVCore
 	url = https://gitlab.kitware.com/LidarView/lidarview-core.git
@@ -11,3 +8,6 @@
 [submodule "Plugins/HesaiPlugin"]
 	path = Plugins/HesaiPlugin
 	url = ../HesaiPlugin
+[submodule "LVSuperbuild"]
+	path = LVSuperbuild
+	url = https://gitlab.kitware.com/LidarView/lidarview-superbuild.git

Application/vvMainWindow.cxx

@@ -159,6 +159,8 @@ vvMainWindow::vvMainWindow()
   this->show();
   this->raise();
   this->activateWindow();
+
+  new pqParaViewBehaviors(this, this);
 }
 
 //-----------------------------------------------------------------------------
@@ -291,9 +293,7 @@ void vvMainWindow::setupPVGUI()
   pqParaViewBehaviors::enableStandardPropertyWidgets();
   pqParaViewBehaviors::setEnableStandardViewFrameActions(false);
   pqParaViewBehaviors::setEnableDefaultViewBehavior(false);
-
   pqParaViewBehaviors::setEnableUsageLoggingBehavior(true);
-  new pqParaViewBehaviors(this, this); // MUST be created before renderView
 }
 
 //-----------------------------------------------------------------------------

LVCore @ ceeb26a1

-Subproject commit 238105e9f4a184090d9f4440a690c12b523572d5
+Subproject commit ceeb26a115eb5eacf36e7a3453bb356e17acdcd6

LVSuperbuild @ fa05f895

+Subproject commit fa05f895440c1ab1ddbed1c5a60e54e84ee944d8

Superbuild/CMakeLists.txt

-cmake_minimum_required(VERSION 3.20.3)
-
-project(LidarViewSuperBuild)
-
-#-----------------------------------------------------------------------------
-# All the function and variable bellow are here because we rely on lidarview's
-# superbuild.
-# To see which function/variable cana/needs to be set, please take a look at
-# the CMakeLists.txt inside "lidarview-superbuild"
-#-----------------------------------------------------------------------------
-
-option(INTERPRETER_ENABLE_Velodyne "Enable Velodyne interpreter " ON)
-option(INTERPRETER_ENABLE_Hesai "Enable Hesai interpreter (requires pcl)" OFF)
-if(INTERPRETER_ENABLE_Hesai)
-  if(NOT ENABLE_pcl)
-    message(FATAL_ERROR "Hesai interpreter requires pcl")
-  endif()
-endif()
-
-list(APPEND superbuild_project_roots
-  "${CMAKE_CURRENT_SOURCE_DIR}/Projects")
-
-function (add_project_to_superbuild var)
-  # list cannot append to parent's scope so we do it in two steps
-  list(APPEND "${var}" lidarview)
-  set("${var}" "${${var}}" PARENT_SCOPE)
-endfunction ()
-
-list(APPEND superbuild_version_files
-  "${CMAKE_CURRENT_LIST_DIR}/versions.cmake")
-
-add_subdirectory(lidarview-superbuild/)

Superbuild/Projects/apple/lidarview.bundle.cmake

-# Bundling Scripts Stack Entry for $lidarview_appname - Apple Specific
-include(lidarview.bundle.common)
-
-# Trigger Apple-specific LidarView Bundling
-include(${LidarViewSuperBuild_CMAKE_DIR}/bundle/apple/LidarviewBundle.cmake)
-
-# LidarView-Apple Specifics
-
-# Sensor calibration files
-file(GLOB shared_files "${share_path}/*.csv")
-install(FILES ${shared_files}
-        DESTINATION "${lidarview_appname}/Contents/Resources"
-        COMPONENT superbuild)
-unset(shared_files)
-
-file(GLOB shared_files "${share_path}/*.xml")
-install(FILES ${shared_files}
-        DESTINATION "${lidarview_appname}/Contents/Resources"
-        COMPONENT superbuild)
-unset(shared_files)

Superbuild/Projects/lidarview.bundle.common.cmake

-# Crossplatform Bundling scripts for $lidarview_appname 
-
-set(LidarViewSuperBuild_SOURCE_DIR "${superbuild_source_directory}")
-set(LidarViewSuperBuild_CMAKE_DIR "${LidarViewSuperBuild_SOURCE_DIR}/lidarview-superbuild/CMake")
-set(LidarViewSuperBuild_LVCORE_CMAKE_DIR "${LidarViewSuperBuild_SOURCE_DIR}/../LVCore/CMake")
-
-# Make sure Branding is set early
-include(${LidarViewSuperBuild_SOURCE_DIR}/../Application/branding.cmake)
-
-# Trigger Crossplatform LidarView Bundling
-include(${LidarViewSuperBuild_CMAKE_DIR}/bundle/LidarviewBundleCommon.cmake)
-
-# Add $lidarview_appname specific executables in common with all platforms
-list(APPEND lidarview_executables
-  "PacketFileSender"
-  )
-
-# Add $lidarview_appname specific modules in common with all platforms
-#list(APPEND lidarview_modules ...)
-
-# Add $lidarview_appname specific python modules in common with all platforms
-list(APPEND lidarview_modules_python
-  VelodynePlugin
-  lidarviewpythonplugin
-  
-  camera_path
-  colormap_tools
-  temporal_animation_cue_helpers
-  example_temporal_animation
-  example_non_temporal_animation
-  numpy
-  )
-
-# Set $lidarview_appname license file.
-set(CPACK_RESOURCE_FILE_LICENSE "${LidarViewSuperBuild_SOURCE_DIR}/lidarview-superbuild/LICENSE")
-
-

Superbuild/Projects/lidarview.cmake

-superbuild_add_project(lidarview
-  DEPENDS cxx11 paraview qt5 pcap boost eigen liblas yaml python3 pythonqt numpy
-  DEPENDS_OPTIONAL pcl ceres opencv nanoflann g2o
-  DEFAULT_ON
-  CMAKE_ARGS
-    #LidarView base configuration
-    -DBUILD_SHARED_LIBS:BOOL=ON
-    -DBUILD_TESTING:BOOL=OFF
-    -DCMAKE_MACOSX_RPATH:BOOL=OFF
-    -DLV_BUILD_PLATFORM=${LV_BUILD_PLATFORM}
-    -Dsuperbuild_python_version=${superbuild_python_version}
-    -DParaView_DIR:PATH=${SuperBuild_BINARY_DIR}/common-superbuild/paraview/build
-    -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD}
-    -Dparaview_version=${paraview_version}
-    -Dqt_version:STRING=${qt_version}
-    #$lidarview_appname dependencies options
-    -DENABLE_pcl=${ENABLE_pcl}
-    -DENABLE_ceres=${ENABLE_ceres}
-    -DENABLE_opencv=${ENABLE_opencv}
-    -DENABLE_nanoflann=${ENABLE_nanoflann}
-    -DENABLE_g2o=${ENABLE_g2o}
-    #$lidarview_appname features options
-    -DLIDARVIEW_BUILD_SLAM=${LIDARVIEW_BUILD_SLAM}
-    -DLIDARVIEW_BUILD_VELODYNE=${INTERPRETER_ENABLE_Velodyne}
-    -DLIDARVIEW_BUILD_HESAI=${INTERPRETER_ENABLE_Hesai}
-    #$lidarview_appname additional configuration
-)
-
-# This Disable Boost autolinking feature and ease use of Boost as a dynamic library.
-# Boost_USE_STATIC_LIBS is off by default, but sometimes that is not sufficient
-# on windows (especially with MSVC ?)
-if (WIN32 OR APPLE)
-  superbuild_append_flags(cxx_flags "-DBOOST_ALL_NO_LIB" PROJECT_ONLY)
-  superbuild_append_flags(cxx_flags "-DBOOST_ALL_DYN_LINK" PROJECT_ONLY)
-endif()

Superbuild/Projects/unix/lidarview.bundle.cmake

-# Bundling Scripts Stack Entry for $lidarview_appname - Unix Specific
-include(lidarview.bundle.common)
-
-# Trigger Unix-specific LidarView Bundling
-include(${LidarViewSuperBuild_CMAKE_DIR}/bundle/unix/LidarviewBundle.cmake)
-
-# LidarView-Unix Specifics
-
-# Sensor calibration files
-file(GLOB shared_files "${superbuild_install_location}/share/*.csv")
-install(FILES ${shared_files}
-        DESTINATION "${LV_INSTALL_RESOURCE_DIR}")
-unset(shared_files)
-file(GLOB shared_files "${superbuild_install_location}/share/*.xml")
-install(FILES ${shared_files}
-        DESTINATION "${LV_INSTALL_RESOURCE_DIR}")
-unset(shared_files)

Superbuild/Projects/win32/lidarview.bundle.cmake

-# Bundling Scripts Stack Entry for $lidarview_appname - Win32 Specific
-include(lidarview.bundle.common)
-
-# Trigger Win32-specific LidarView Bundling
-include(${LidarViewSuperBuild_CMAKE_DIR}/bundle/win32/LidarviewBundle.cmake)
-
-# LidarView-Win32 Specifics
-
-# Sensor calibration files
-file(GLOB shared_files "${superbuild_install_location}/share/*.csv")
-install(FILES ${shared_files}
-        DESTINATION "${LV_INSTALL_RESOURCE_DIR}")
-unset(shared_files)
-file(GLOB shared_files "${superbuild_install_location}/share/*.xml")
-install(FILES ${shared_files}
-        DESTINATION "${LV_INSTALL_RESOURCE_DIR}")
-unset(shared_files)

lidarview-superbuild @ 1a2b52e7

-Subproject commit 1a2b52e7b21c6c30710dae0fe479d4be99489c50

Superbuild/versions.cmake

-superbuild_set_revision(lidarview
-    SOURCE_DIR ${CMAKE_SOURCE_DIR}/..
-    DOWNLOAD_COMMAND "")