From 8a7ee4a016bc0f5aa401c527be83206f16ea49f5 Mon Sep 17 00:00:00 2001 From: Steve Macenski Date: Tue, 27 Jun 2023 10:51:23 -0700 Subject: [PATCH 1/2] Resolves 3646: Update CMAKE_COMPILER_IS_GNUCXX --- nav2_common/cmake/nav2_package.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nav2_common/cmake/nav2_package.cmake b/nav2_common/cmake/nav2_package.cmake index 13388193f37..3f4977193c8 100644 --- a/nav2_common/cmake/nav2_package.cmake +++ b/nav2_common/cmake/nav2_package.cmake @@ -36,7 +36,7 @@ macro(nav2_package) endif() endif() - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wdeprecated -fPIC -Wshadow -Wnull-dereference) add_compile_options("$<$:-Wnon-virtual-dtor>") endif() From 77262760219e71e4a3fe1f5054d7ec4f8ae25dbc Mon Sep 17 00:00:00 2001 From: Steve Macenski Date: Tue, 27 Jun 2023 10:52:21 -0700 Subject: [PATCH 2/2] Update CMakeLists.txt --- nav2_rviz_plugins/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nav2_rviz_plugins/CMakeLists.txt b/nav2_rviz_plugins/CMakeLists.txt index c683dffb63f..51df97f4213 100644 --- a/nav2_rviz_plugins/CMakeLists.txt +++ b/nav2_rviz_plugins/CMakeLists.txt @@ -6,7 +6,7 @@ if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 17) endif() -if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") +if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic -Werror) endif()