Truly optional CMake function

Author: toroidal-code

CMakeLists.txt

@@ -72,19 +72,20 @@ endfunction(add_spec)
 function(discover_specs spec_folder)
   file(GLOB_RECURSE specs ${spec_folder}/*_spec.cpp)
 
-  foreach(spec IN LISTS specs)
-    add_spec(${spec} "")
-  endforeach()
-endfunction(discover_specs)
-
-function(discover_specs_output_junit spec_folder)
-  file(GLOB_RECURSE specs ${spec_folder}/*_spec.cpp)
+  if (${ARGC} GREATER 1)
+    set(output_junit ${ARGV1})
+  else()
+    set(output_junit FALSE)
+  endif()
 
   foreach(spec IN LISTS specs)
-    cmake_path(GET spec STEM spec_name)
-    add_spec(${spec} "--output-junit;${CMAKE_CURRENT_BINARY_DIR}/results/${spec_name}.xml")
+    if (${output_junit})
+      add_spec(${spec} "--output-junit;${CMAKE_CURRENT_BINARY_DIR}/results/${spec_name}.xml")
+    else()
+      add_spec(${spec} "")
+    endif()
   endforeach()
-endfunction(discover_specs_output_junit)
+endfunction()
 
 # OPTIONS
 option(CPPSPEC_BUILD_TESTS "Build C++Spec tests")

include/formatters/formatters_base.hpp

@@ -92,6 +92,7 @@ class BaseFormatter {
       case Result::Status::Skipped:
         return YELLOW;
     }
+    return "";  // Default to no color
   }
 
   const char* reset_color() { return color_output ? RESET : ""; }

spec/CMakeLists.txt

@@ -2,4 +2,4 @@ if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   add_compile_options(-Wno-unused-parameter -Wno-missing-template-arg-list-after-template-kw -Wno-missing-template-keyword -Wno-unknown-warning-option)
 endif()
 
-discover_specs_output_junit(${CMAKE_CURRENT_SOURCE_DIR})
+discover_specs(${CMAKE_CURRENT_SOURCE_DIR} TRUE)