Skip to content
Snippets Groups Projects
Commit 31a715b3 authored by Timothée Couble's avatar Timothée Couble
Browse files

Merge branch 'refact/updateCIWithNewSuperbuildOptions' into 'master' 

[refact][ci] Update CI with new superbuild options

See merge request !385
parents b64292e0 8d05c32c
1 merge request!385[refact][ci] Update CI with new superbuild options
Pipeline #320340 passed
Stage: test
Pipeline: LidarView

#320341

    Hide whitespace changes
    Inline Side-by-side
    CI/.gitlab-ci-for-lidarview.yml
    + 6
    − 15
    View file @ 31a715b3
    ...@@ -34,15 +34,9 @@ variables: ...@@ -34,15 +34,9 @@ variables:
    value: '-GNinja' value: '-GNinja'
    sb_cmake_option_USE_SYSTEM_qt5: # Most of our Platforms use qt5 with offline Installers sb_cmake_option_USE_SYSTEM_qt5: # Most of our Platforms use qt5 with offline Installers
    value: '-DUSE_SYSTEM_qt5=True' value: '-DUSE_SYSTEM_qt5=True'
    sb_cmake_option_ENABLE_ceres: sb_cmake_option_ENABLE_slam:
    value: '-DENABLE_ceres=False' value: '-DENABLE_slam=False'
    sb_cmake_option_ENABLE_nanoflann: sb_cmake_option_ENABLE_hesaisdk:
    value: '-DENABLE_nanoflann=False'
    sb_cmake_option_ENABLE_pcl:
    value: '-DENABLE_pcl=False'
    sb_cmake_option_LIDARVIEW_ENABLE_SLAM:
    value: '-DLIDARVIEW_ENABLE_SLAM=False'
    sb_cmake_option_ENABLE_INTERPRETER_HESAI:
    value: '' # Keep it empty as only LidarView use it value: '' # Keep it empty as only LidarView use it
    stages: stages:
    ...@@ -114,7 +108,7 @@ workflow: ...@@ -114,7 +108,7 @@ workflow:
    - cmake -E remove_directory $LV_PROJECT_BSB_PATH - cmake -E remove_directory $LV_PROJECT_BSB_PATH
    - cmake -E make_directory $LV_PROJECT_SRC_PATH - cmake -E make_directory $LV_PROJECT_SRC_PATH
    - cmake -E make_directory $LV_PROJECT_BSB_PATH - cmake -E make_directory $LV_PROJECT_BSB_PATH
    - echo "CI SB OPTIONS= $sb_cmake_option_USE_SYSTEM_qt5 $sb_cmake_option_ENABLE_ceres $sb_cmake_option_ENABLE_nanoflann $sb_cmake_option_ENABLE_pcl $sb_cmake_option_LIDARVIEW_ENABLE_SLAM $sb_cmake_option_ENABLE_INTERPRETER_HESAI" - echo "CI SB OPTIONS= $sb_cmake_option_USE_SYSTEM_qt5 $sb_cmake_option_ENABLE_slam $sb_cmake_option_ENABLE_hesaisdk"
    - cd $LV_PROJECT_SRC_PATH # First Fetch Master - cd $LV_PROJECT_SRC_PATH # First Fetch Master
    - echo "Using SB_CI_AUTH=$SB_CI_AUTH" # Optional auth for private repositories e.g "gitlab-ci-token:[masked]@" - echo "Using SB_CI_AUTH=$SB_CI_AUTH" # Optional auth for private repositories e.g "gitlab-ci-token:[masked]@"
    - git clone -j 8 https://$SB_CI_AUTH$CI_SERVER_HOST/$CI_PROJECT_PATH.git . # Clone in Place, no submodules, no recursive, smudged - git clone -j 8 https://$SB_CI_AUTH$CI_SERVER_HOST/$CI_PROJECT_PATH.git . # Clone in Place, no submodules, no recursive, smudged
    ...@@ -142,11 +136,8 @@ workflow: ...@@ -142,11 +136,8 @@ workflow:
    $sb_cmake_option_CMAKE_OSX_ARCHITECTURES $sb_cmake_option_CMAKE_OSX_ARCHITECTURES
    $sb_cmake_option_CMAKE_OSX_DEPLOYMENT_TARGET $sb_cmake_option_CMAKE_OSX_DEPLOYMENT_TARGET
    $sb_cmake_option_CMAKE_OSX_SDK $sb_cmake_option_CMAKE_OSX_SDK
    $sb_cmake_option_ENABLE_ceres $sb_cmake_option_ENABLE_slam
    $sb_cmake_option_ENABLE_nanoflann $sb_cmake_option_ENABLE_hesaisdk
    $sb_cmake_option_ENABLE_pcl
    $sb_cmake_option_LIDARVIEW_ENABLE_SLAM
    $sb_cmake_option_ENABLE_INTERPRETER_HESAI
    $SB_ADDITIONAL_PARAMS $SB_ADDITIONAL_PARAMS
    -DBUILD_TESTING=ON -DBUILD_TESTING=ON
    -Dsuperbuild_download_location="../downloads" -Dsuperbuild_download_location="../downloads"
    ......
    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