diff --git a/.travis.yml b/.travis.yml index ad108164..89b7bef9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ env: global: - NOT_TEST_BUILD=true - UPSTREAM_WORKSPACE='dependencies_ros1.rosinstall' + - ROSDEP_SKIP_KEYS='iwyu' + - ADDITIONAL_DEBS='iwyu' matrix: include: diff --git a/noether_filtering/package.xml b/noether_filtering/package.xml index 88641d01..2fb776b2 100644 --- a/noether_filtering/package.xml +++ b/noether_filtering/package.xml @@ -7,7 +7,7 @@ Apache 2.0 Jorge Nicho - console_bridge + libconsole-bridge-dev pluginlib libpcl-all-dev diff --git a/vtk_viewer/CMakeLists.txt b/vtk_viewer/CMakeLists.txt index 60ede11c..eba19b43 100644 --- a/vtk_viewer/CMakeLists.txt +++ b/vtk_viewer/CMakeLists.txt @@ -20,6 +20,12 @@ endif() find_package(Eigen3 REQUIRED) find_package(console_bridge REQUIRED) +if(NOETHER_ENABLE_TESTING) + set(CLANG_ARGS ${DEFAULT_CLANG_TIDY_ERROR_ARGS}) +else() + set(CLANG_ARGS ${DEFAULT_CLANG_TIDY_WARNING_ARGS}) +endif() + add_code_coverage() add_library(${PROJECT_NAME} SHARED src/mouse_interactor.cpp src/vtk_utils.cpp src/${PROJECT_NAME}.cpp) @@ -30,9 +36,10 @@ target_include_directories(${PROJECT_NAME} PUBLIC target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}) -target_clang_tidy(${PACKAGE_NAME} ${DEFAULT_CLANG_TIDY_ERROR_ARGS}) -target_include_what_you_use(${PACKAGE_NAME} ${DEFAULT_IWYU_ARGS}) -target_cppcheck(${PACKAGE_NAME} ${DEFAULT_CPPCHECK_ARGS}) +target_cxx_version(${PROJECT_NAME} PUBLIC 14) +target_clang_tidy(${PROJECT_NAME} ${CLANG_ARGS}) +target_include_what_you_use(${PROJECT_NAME} ${DEFAULT_IWYU_ARGS}) +target_cppcheck(${PROJECT_NAME} ${DEFAULT_CPPCHECK_ARGS}) configure_package(NAMESPACE noether TARGETS ${PROJECT_NAME}) diff --git a/vtk_viewer/cmake/vtk_viewer-config.cmake.in b/vtk_viewer/cmake/vtk_viewer-config.cmake.in index 5bea2682..e3fb8a94 100644 --- a/vtk_viewer/cmake/vtk_viewer-config.cmake.in +++ b/vtk_viewer/cmake/vtk_viewer-config.cmake.in @@ -7,7 +7,7 @@ set_and_check(@PROJECT_NAME@_LIBRARIES "${PACKAGE_PREFIX_DIR}/lib") include(CMakeFindDependencyMacro) find_dependency(cmake_common_scripts) find_dependency(console_bridge) -find_dependency(PCL 1.9) -find_dependency(VTK 7.1) +find_dependency(PCL) +find_dependency(VTK) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake") diff --git a/vtk_viewer/package.xml b/vtk_viewer/package.xml index 5be9774d..fdc6a5ee 100644 --- a/vtk_viewer/package.xml +++ b/vtk_viewer/package.xml @@ -8,7 +8,7 @@ catkin cmake_common_scripts - console_bridge + libconsole-bridge-dev libpcl-all-dev rosunit diff --git a/vtk_viewer/test/CMakeLists.txt b/vtk_viewer/test/CMakeLists.txt index f545416c..8eb8240e 100644 --- a/vtk_viewer/test/CMakeLists.txt +++ b/vtk_viewer/test/CMakeLists.txt @@ -5,5 +5,5 @@ target_link_libraries(${PROJECT_NAME}_unit PRIVATE GTest::GTest GTest::Main ${PR target_clang_tidy(${PROJECT_NAME}_unit) add_code_coverage(${PROJECT_NAME}_unit ALL EXCLUDE ${COVERAGE_EXCLUDE}) add_gtest_discover_tests(${PROJECT_NAME}_unit) -add_dependencies(${PROJECT_NAME}_unit ${PROJECT_NAME}_unit) +add_dependencies(${PROJECT_NAME}_unit ${PROJECT_NAME}) add_dependencies(run_tests ${PROJECT_NAME}_unit)