Merge pull request #419 from Ryanf55/stop-using-CMAKE_COMPILER_IS_GNUCXX

Stop using deprecated CMAKE_COMPILER_IS_GNUCXX
ANYbotics · Feb 4, 2024 · 46e4511 · 46e4511
2 parents 734c11d + 661aac2
commit 46e4511
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/grid_map_cmake_helpers/cmake/grid_map_package.cmake b/grid_map_cmake_helpers/cmake/grid_map_package.cmake
@@ -16,7 +16,7 @@ macro(grid_map_package)
     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 -Wdeprecated -fPIC)
   endif()
 

diff --git a/grid_map_demos/CMakeLists.txt b/grid_map_demos/CMakeLists.txt
@@ -201,7 +201,7 @@ set(targets_list
 )
 
 foreach(target ${targets_list})
-  if(CMAKE_COMPILER_IS_GNUCXX)
+  if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     target_compile_options(${target} PRIVATE "SHELL:--param ggc-min-expand=1")
     target_compile_options(${target} PRIVATE "SHELL:--param ggc-min-heapsize=32768")
   endif()

diff --git a/grid_map_filters/CMakeLists.txt b/grid_map_filters/CMakeLists.txt
@@ -87,7 +87,7 @@ foreach(lib_name ${filter_libs})
     ${dependencies}
   )
 
-  if(CMAKE_COMPILER_IS_GNUCXX)
+  if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     target_compile_options(${lib_name} PRIVATE "SHELL:--param ggc-min-expand=1")
     target_compile_options(${lib_name} PRIVATE "SHELL:--param ggc-min-heapsize=32768")
   endif()