Commit 61e5a4a9 authored by Arnaud Billon's avatar Arnaud Billon
Browse files

Merge branch 'ci-enable-all-deps' into 'master'

[refactor][lv-sb] Enable All SLAM dependencies on CI

See merge request !27
parents 5c5d7e76 8eee0be5
......@@ -33,9 +33,10 @@ endif()
set(lidarview_appname "${SOFTWARE_NAME}.app")
set(lidarview_additional_libraries)
if(ENABLE_slam)
LIST(APPEND lidarview_additional_libraries "${superbuild_install_location}/bin/${lidarview_appname}/Contents/Libraries/libLidarSlam.dylib")
endif()
# Not needed anymore as Slam is now a standalone plugin, kept for future reference
#if(LIDARVIEW_BUILD_SLAM)
# LIST(APPEND lidarview_additional_libraries "${superbuild_install_location}/bin/${lidarview_appname}/Contents/Libraries/libLidarSlam.dylib")
#endif()
superbuild_apple_create_app(
"\${CMAKE_INSTALL_PREFIX}"
......
cmake_minimum_required(VERSION 3.12)
cmake_policy(SET CMP0114 OLD) #WIP Hide superbuild ExternalProject warnings on cmake 3.19+, to be removed on PV5.9 upgrade
#Sanitize checks
if(NOT SOFTWARE_NAME OR NOT SOFTWARE_VENDOR)
......@@ -197,7 +198,6 @@ function (superbuild_add_packaging)
SOFTWARE_NAME
SOFTWARE_VENDOR
package_suffix
ENABLE_slam
)
set(default_package lidarview)
......@@ -255,24 +255,32 @@ set(_superbuild_default_cxx11 ON)
# set the default for qt5 to be 5.10
set(_superbuild_qt5_default_selection "5.10")
# Dependencies Options
option(ENABLE_all "Enable all optional dependancy like pcl, ceres, opencv, darknet, ..." OFF)
if (ENABLE_all)
set(ENABLE_opencv ON CACHE BOOL "enable OpenCV")
set(ENABLE_ceres ON CACHE BOOL "enable Ceres")
set(ENABLE_pcl ON CACHE BOOL "enable PCL")
set(ENABLE_nanoflann ON CACHE BOOL "enable nanoflann")
set(ENABLE_darknet ON CACHE BOOL "enable darknet")
#set(ENABLE_darknet ON CACHE BOOL "enable darknet")
set(ENABLE_g2o ON CACHE BOOL "enable G2O")
endif(ENABLE_all)
option(ENABLE_slam "Build Lidar SLAM (requires PCL, Ceres, nanoflann; optional g2o)" OFF)
option(ENABLE_old_slam "Build old deprecated Lidar SLAM (requires PCL, Ceres, nanoflann). Should not be used if new SLAM is being built." OFF)
mark_as_advanced(ENABLE_old_slam)
if (ENABLE_slam AND ENABLE_old_slam)
message(WARNING "ENABLE_slam and ENABLE_old_slam are both set to ON. "
"It is strongly recommended to build only one of these two SLAM filters to avoid runtime errors due to names collisions.")
endif(ENABLE_slam AND ENABLE_old_slam)
# Features Options
option(LIDARVIEW_BUILD_SLAM "Build Lidar SLAM (requires PCL, Ceres, nanoflann; optional g2o)" OFF)
if(LIDARVIEW_BUILD_SLAM)
if(NOT ENABLE_ceres)
message(FATAL_ERROR "SLAM requires Ceres")
endif()
if(NOT ENABLE_pcl)
message(FATAL_ERROR "SLAM requires PCL")
endif()
if(NOT ENABLE_nanoflann)
message(FATAL_ERROR "SLAM requires nanoflann")
endif()
endif()
# Common-SuperBuild
add_subdirectory(common-superbuild)
# Check if some Boost environment variables could hide local Boost install
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment