Merge pull request #4059 from rouault/weffc++

Enable -Weffc++ for gcc and clang
OSGeo · Feb 20, 2024 · 498d409 · 498d409
2 parents 81fecbc + 375a7c5
commit 498d409
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,7 +56,9 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
   set(PROJ_C_WARN_FLAGS ${PROJ_common_WARN_FLAGS}
     -Wmissing-prototypes
   )
-  set(PROJ_CXX_WARN_FLAGS ${PROJ_common_WARN_FLAGS})
+  set(PROJ_CXX_WARN_FLAGS ${PROJ_common_WARN_FLAGS}
+    -Weffc++
+  )
 elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
   set(PROJ_C_WARN_FLAGS ${PROJ_common_WARN_FLAGS}
     -Wmissing-prototypes
@@ -65,6 +67,7 @@ elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
   )
   set(PROJ_CXX_WARN_FLAGS ${PROJ_common_WARN_FLAGS}
     -Wfloat-conversion
+    -Weffc++
   )
 elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
   add_definitions(/D_CRT_SECURE_NO_WARNINGS) # Eliminate deprecation warnings

diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
@@ -69,7 +69,8 @@ include_directories(${PROJ_SOURCE_DIR}/include)
 include_directories(${PROJ_BINARY_DIR}/src)
 
 # Apply to targets in the current directory and below
-add_compile_options(${PROJ_CXX_WARN_FLAGS})
+add_compile_options("$<$<COMPILE_LANGUAGE:C>:${PROJ_C_WARN_FLAGS}>")
+add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${PROJ_CXX_WARN_FLAGS}>")
 
 set(PROJ_TEST_ENVIRONMENT
   "PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES"