Skip to content

Commit

Permalink
Merge branch 'ign-sensors6' into aditya/named_frames_imu
Browse files Browse the repository at this point in the history
  • Loading branch information
scpeters authored Mar 3, 2022
2 parents 90f6917 + 0e1f36b commit a265be9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ jobs:
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@focal
with:
cpplint-enabled: true
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ if (MSVC)
# TODO(louise) Remove this once warnings are suppressed in ign-rendering
set_source_files_properties(
${rendering_sources}
SegmentationCameraSensor.cc
COMPILE_FLAGS "/wd4251"
)
endif()
Expand Down

0 comments on commit a265be9

Please sign in to comment.