Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
mpowelson committed Jul 7, 2020
1 parent b342ee4 commit 3e2ec55
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ env:
global:
- NOT_TEST_BUILD=true
- UPSTREAM_WORKSPACE='dependencies_ros1.rosinstall'
- ROSDEP_SKIP_KEYS='iwyu'
- ADDITIONAL_DEBS='iwyu'

matrix:
include:
Expand Down
13 changes: 10 additions & 3 deletions vtk_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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})

Expand Down
4 changes: 2 additions & 2 deletions vtk_viewer/cmake/vtk_viewer-config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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}/@[email protected]")

0 comments on commit 3e2ec55

Please sign in to comment.