#1602: CMake: enable warnings in tests and examples

DARMA-tasking · Nov 23, 2021 · 419599e · 419599e
1 parent 98666b0
commit 419599e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/cmake/turn_on_warnings.cmake b/cmake/turn_on_warnings.cmake
@@ -1,23 +1,31 @@
 include(CheckCXXCompilerFlag)
 
-function(enable_cxx_compiler_flag_if_supported flag)
+macro(add_cxx_compiler_flag_if_supported flag)
   check_cxx_compiler_flag("${flag}" flag_supported)
   if(flag_supported)
-    target_compile_options(${vt_target} PRIVATE ${flag})
+    list(APPEND VT_WARNING_FLAGS "${flag}")
   endif()
   unset(flag_supported CACHE)
-endfunction()
+endmacro()
 
-function(turn_on_warnings vt_target)
-  enable_cxx_compiler_flag_if_supported("-Wall")
-  enable_cxx_compiler_flag_if_supported("-pedantic")
-  enable_cxx_compiler_flag_if_supported("-Wshadow")
-  enable_cxx_compiler_flag_if_supported("-Wno-unknown-pragmas")
-  enable_cxx_compiler_flag_if_supported("-Wsign-compare")
+if(NOT DEFINED VT_WARNING_FLAGS)
+  add_cxx_compiler_flag_if_supported("-Wall")
+  add_cxx_compiler_flag_if_supported("-pedantic")
+  add_cxx_compiler_flag_if_supported("-Wshadow")
+  add_cxx_compiler_flag_if_supported("-Wno-unknown-pragmas")
+  add_cxx_compiler_flag_if_supported("-Wsign-compare")
   # Not really a warning, is still diagnostic related..
-  enable_cxx_compiler_flag_if_supported("-ftemplate-backtrace-limit=100")
+  add_cxx_compiler_flag_if_supported("-ftemplate-backtrace-limit=100")
 
   if (vt_werror_enabled)   # Treat warning as errors
-    enable_cxx_compiler_flag_if_supported("-Werror")
+  add_cxx_compiler_flag_if_supported("-Werror")
   endif()
-endfunction()
+endif()
+
+set(
+  VT_WARNING_FLAGS ${VT_WARNING_FLAGS} CACHE INTERNAL
+  "Project's warning options")
+
+macro(turn_on_warnings vt_target)
+  target_compile_options(${vt_target} PRIVATE ${VT_WARNING_FLAGS})
+endmacro()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -8,12 +8,16 @@ set(
   tutorial
 )
 
+include(turn_on_warnings)
+
 macro(add_example example_name)
   set(EXAMPLE_FILE "${example_name}.cc")
 
   add_executable(${example_name} ${EXAMPLE_FILE})
   add_dependencies(examples ${example_name})
 
+  turn_on_warnings(${example_name})
+
   if (vt_unity_build_enabled)
     set_target_properties(${example_name} PROPERTIES UNITY_BUILD ON)
   endif()

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -62,6 +62,7 @@ set_target_properties(gtest_main PROPERTIES FOLDER extern)
 #set_target_properties(gmock_main PROPERTIES FOLDER extern)
 
 include(GoogleTest)
+include(turn_on_warnings)
 
 function(add_unit_test unit_test_name unit_test_files uses_mpi)
   add_executable(
@@ -76,6 +77,8 @@ function(add_unit_test unit_test_name unit_test_files uses_mpi)
   target_include_directories(${unit_test_name} PRIVATE ${PROJECT_TEST_UNIT_DIR})
   target_include_directories(${unit_test_name} PRIVATE ${PROJECT_GTEST_INCLUDE_DIR})
 
+  turn_on_warnings(${unit_test_name})
+
   link_target_with_vt(
     TARGET ${unit_test_name}
     DEFAULT_LINK_SET