From e2936447aa0dababd37605d4f0fa752953cc8799 Mon Sep 17 00:00:00 2001 From: Juan Pablo Samper Date: Tue, 1 May 2018 11:07:20 -0700 Subject: [PATCH] Gracefully exit if pclint not found --- ament_cmake_pclint/CMakeLists.txt | 2 +- ament_cmake_pclint/cmake/ament_pclint.cmake | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ament_cmake_pclint/CMakeLists.txt b/ament_cmake_pclint/CMakeLists.txt index 2cd8734f..09f90e1c 100644 --- a/ament_cmake_pclint/CMakeLists.txt +++ b/ament_cmake_pclint/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.9) project(ament_cmake_pclint NONE) diff --git a/ament_cmake_pclint/cmake/ament_pclint.cmake b/ament_cmake_pclint/cmake/ament_pclint.cmake index 147f8fb7..e9ef2ba5 100644 --- a/ament_cmake_pclint/cmake/ament_pclint.cmake +++ b/ament_cmake_pclint/cmake/ament_pclint.cmake @@ -43,7 +43,9 @@ function(ament_pclint) find_program(ament_pclint_BIN NAMES "ament_pclint") if(NOT ament_pclint_BIN) - message(FATAL_ERROR "ament_pclint() could not find program 'ament_pclint'") + message(WARNING "ament_pclint() could not find program 'ament_pclint', skipping.") + set(_ament_pclint_BIN_FOUND "FALSE" PARENT_SCOPE) + return() endif() set(cmd "${ament_pclint_BIN}" ${ARG_UNPARSED_ARGUMENTS}) @@ -109,4 +111,10 @@ function(ament_pclint) PROPERTIES LABELS "pclint;linter" ) + if(NOT _ament_pclint_BIN_FOUND) + set_test_properties( + "${ARG_TESTNAME}" + PROPERTIES + DISABLED "TRUE" + endif() endfunction()