From 144569628b51bc1704e912b586fa85fa50278fad Mon Sep 17 00:00:00 2001 From: Ryohsuke Mitsudome <43976834+mitsudome-r@users.noreply.github.com> Date: Fri, 30 Sep 2022 17:38:15 +0900 Subject: [PATCH] fix(lidar_apollo_segmentation_tvm): always run ament_auto_package() in CMakeLists.txt (#1995) Signed-off-by: mitsudome-r Signed-off-by: mitsudome-r --- perception/lidar_apollo_segmentation_tvm/CMakeLists.txt | 1 + perception/lidar_apollo_segmentation_tvm_nodes/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/perception/lidar_apollo_segmentation_tvm/CMakeLists.txt b/perception/lidar_apollo_segmentation_tvm/CMakeLists.txt index ac3c4bd870769..f665a22a6005b 100644 --- a/perception/lidar_apollo_segmentation_tvm/CMakeLists.txt +++ b/perception/lidar_apollo_segmentation_tvm/CMakeLists.txt @@ -72,4 +72,5 @@ if(baidu_cnn_FOUND) ament_auto_package() else() message(WARNING "Neural network not found, skipping package.") + ament_auto_package() endif() diff --git a/perception/lidar_apollo_segmentation_tvm_nodes/CMakeLists.txt b/perception/lidar_apollo_segmentation_tvm_nodes/CMakeLists.txt index 8a97a1ef05d5a..202cac6ad328a 100644 --- a/perception/lidar_apollo_segmentation_tvm_nodes/CMakeLists.txt +++ b/perception/lidar_apollo_segmentation_tvm_nodes/CMakeLists.txt @@ -19,7 +19,8 @@ find_package(autoware_cmake REQUIRED) autoware_package() # Check that a neural network was available for lidar_apollo_segmentation_tvm to be built. -if(lidar_apollo_segmentation_tvm_FOUND) +autoware_check_neural_network(baidu_cnn "${${lidar_apollo_segmentation_tvm}_BACKEND}") +if(baidu_cnn_FOUND) # Set lidar_apollo_segmentation_tvm includes as "SYSTEM" to ignore compiler errors on PCL headers include_directories(SYSTEM "${lidar_apollo_segmentation_tvm_INCLUDE_DIRS}") @@ -48,4 +49,5 @@ if(lidar_apollo_segmentation_tvm_FOUND) ) else() message(WARNING "lidar_apollo_segmentation_tvm not found, skipping package.") + ament_auto_package() endif()