Skip to content

Commit eaf0399

Browse files
authored
Merge pull request #426 from ANYbotics/mergify/bp/iron/pr-419
Stop using deprecated CMAKE_COMPILER_IS_GNUCXX (backport #419)
2 parents 0905718 + fea1d5a commit eaf0399

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

grid_map_cmake_helpers/cmake/grid_map_package.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ macro(grid_map_package)
1717
set(CMAKE_CXX_STANDARD 17)
1818
endif()
1919

20-
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
20+
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
2121
add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wdeprecated -fPIC)
2222
endif()
2323

grid_map_demos/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ set(targets_list
201201
)
202202

203203
foreach(target ${targets_list})
204-
if(CMAKE_COMPILER_IS_GNUCXX)
204+
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
205205
target_compile_options(${target} PRIVATE "SHELL:--param ggc-min-expand=1")
206206
target_compile_options(${target} PRIVATE "SHELL:--param ggc-min-heapsize=32768")
207207
endif()

grid_map_filters/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ foreach(lib_name ${filter_libs})
8787
${dependencies}
8888
)
8989

90-
if(CMAKE_COMPILER_IS_GNUCXX)
90+
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
9191
target_compile_options(${lib_name} PRIVATE "SHELL:--param ggc-min-expand=1")
9292
target_compile_options(${lib_name} PRIVATE "SHELL:--param ggc-min-heapsize=32768")
9393
endif()

0 commit comments

Comments
 (0)