Restrict no inlining flags for compatibility

Signed-off-by: Michel Hidalgo <[email protected]>
Ekumen-OS · Oct 1, 2024 · f4205ad · f4205ad
1 parent 4dfc931
commit f4205ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 23 deletions.
diff --git a/beluga/CMakeLists.txt b/beluga/CMakeLists.txt
@@ -36,15 +36,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
               -Wpedantic)
 endif()
 if(CMAKE_BUILD_TYPE MATCHES "Debug")
-  if(CMAKE_COMPILER_IS_GNUCXX)
-    target_compile_options(
-      beluga_compile_options INTERFACE -fno-inline -fno-inline-small-functions
-                                       -fno-default-inline)
-  endif()
-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    target_compile_options(beluga_compile_options
-                           INTERFACE -fno-inline-functions)
-  endif()
+  target_compile_options(beluga_compile_options INTERFACE -fno-inline)
 endif()
 
 find_package(Eigen3 REQUIRED NO_MODULE)

diff --git a/beluga_amcl/CMakeLists.txt b/beluga_amcl/CMakeLists.txt
@@ -34,13 +34,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     -Wpedantic)
 endif()
 if(CMAKE_BUILD_TYPE MATCHES "Debug")
-  if(CMAKE_COMPILER_IS_GNUCXX)
-    add_compile_options(-fno-inline -fno-inline-small-functions
-                        -fno-default-inline)
-  endif()
-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    add_compile_options(-fno-inline-functions)
-  endif()
+  add_compile_options(-fno-inline)
 endif()
 
 set(ROS_VERSION $ENV{ROS_VERSION})

diff --git a/beluga_ros/CMakeLists.txt b/beluga_ros/CMakeLists.txt
@@ -34,13 +34,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     -Wpedantic)
 endif()
 if(CMAKE_BUILD_TYPE MATCHES "Debug")
-  if(CMAKE_COMPILER_IS_GNUCXX)
-    add_compile_options(-fno-inline -fno-inline-small-functions
-                        -fno-default-inline)
-  endif()
-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    add_compile_options(-fno-inline-functions)
-  endif()
+  add_compile_options(-fno-inline)
 endif()
 
 set(ROS_VERSION $ENV{ROS_VERSION})