Skip to content

Commit 0a4aa4d

Browse files
nakai-omermdrwiega
authored andcommitted
Additional Humble updates
1 parent 5947c38 commit 0a4aa4d

File tree

3 files changed

+9
-93
lines changed

3 files changed

+9
-93
lines changed

nav_layer_from_points/CMakeLists.txt

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(nav_layer_from_points)
33

4-
add_compile_options(-Wall -Wextra -Wpedantic)
4+
if(NOT CMAKE_CXX_STANDARD)
5+
set(CMAKE_CXX_STANDARD 17)
6+
endif()
7+
8+
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
9+
add_compile_options(-Wall -Wextra -Wpedantic)
10+
endif()
511

612
### Dependencies
713
find_package(ament_cmake_auto REQUIRED)
@@ -31,13 +37,11 @@ target_include_directories(${PROJECT_NAME}
3137
)
3238

3339
# Export package
40+
ament_target_dependencies(${PROJECT_NAME} ${dep_pkgs})
3441
ament_export_dependencies(${dep_pkgs})
35-
# Export package nav2_costmap_2d
3642
pluginlib_export_plugin_description_file(nav2_costmap_2d costmap_plugins.xml)
3743

38-
3944
### Install
40-
4145
ament_auto_package(INSTALL_TO_SHARE
4246
config
4347
)

nav_layer_from_points/include/nav_layer_from_points/costmap_layer.h

-88
This file was deleted.

nav_layer_from_points/src/costmap_layer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <nav_layer_from_points/costmap_layer.h>
15+
#include <nav_layer_from_points/costmap_layer.hpp>
1616

1717
#include <fstream>
1818

0 commit comments

Comments
 (0)