--wip-- [skip ci]

Author: GuillaumeLagrange

core/src/codspeed.cpp

@@ -18,7 +18,7 @@ std::string join(const std::vector<std::string> &elements,
 
 CodSpeed::CodSpeed() : is_instrumented(measurement_is_instrumented()) {
   if (!is_instrumented) {
-    std::cout
+    std::cerr
         << "NOTICE: codspeed is enabled, but no performance measurement will "
            "be made since it's running in an unknown environment."
         << std::endl;
@@ -48,6 +48,6 @@ void CodSpeed::end_benchmark() {
   std::string action_str = is_instrumented ? "Measured" : "Checked";
   std::string group_str =
       group_stack.empty() ? "" : " (group: " + join(group_stack, "/") + ")";
-  std::cout << action_str << ": " << current_benchmark << group_str
+  std::cerr << action_str << ": " << current_benchmark << group_str
             << std::endl;
 }

flake.nix

@@ -38,7 +38,7 @@
             buildInputs =
               with pkgs;
               [
-                cmake-language-server
+                gersemi
                 clang-tools
               ]
               ++ commonBuildInputs;

google_benchmark/cmake/Codspeed.cmake

@@ -4,8 +4,20 @@ execute_process(
     COMMAND git rev-parse --show-toplevel
     OUTPUT_VARIABLE GIT_ROOT_DIR
     OUTPUT_STRIP_TRAILING_WHITESPACE
+    RESULT_VARIABLE GIT_COMMAND_RESULT
 )
 
+if(NOT GIT_COMMAND_RESULT EQUAL 0)
+    message(
+        WARNING
+        "Failed to determine the git root directory.\
+        Check that git is in your PATH, and that you are in a git repository.\
+        Continuing, but Codspeed features will not be useable"
+    )
+    # Default to user's cmake source directory
+    set(GIT_ROOT_DIR ${CMAKE_SOURCE_DIR})
+endif()
+
 target_compile_definitions(
     codspeed
     INTERFACE -DCODSPEED_GIT_ROOT_DIR="${GIT_ROOT_DIR}"
@@ -21,14 +33,11 @@ if(DEFINED CODSPEED_MODE)
     elseif(CODSPEED_MODE STREQUAL "walltime")
         target_compile_definitions(codspeed INTERFACE -DCODSPEED_WALLTIME)
     else()
-        # Step 3: Default to "instrumentation" if no value is provided
-        set(CODSPEED_MODE "instrumentation")
-    endif()
-endif()
         message(
             FATAL_ERROR
             "Invalid build mode: ${CODSPEED_MODE}. Use 'instrumentation' or 'walltime'."
         )
-if(CODSPEED_MODE STREQUAL "instrumentation")
-    target_compile_definitions(codspeed INTERFACE -DCODSPEED_INSTRUMENTATION)
-elseif(CODSPEED_MODE STREQUAL "walltime")
+    endif()
+endif()
+
+message(STATUS "Build mode set to: ${CODSPEED_MODE}")