fix: allow project to build on windows

Author: GuillaumeLagrange

core/CMakeLists.txt

@@ -77,7 +77,7 @@ set_property(
 )
 
 if(NOT CODSPEED_MODE STREQUAL "off")
-    target_compile_definitions(codspeed INTERFACE -DCODSPEED_ENABLED)
+    target_compile_definitions(codspeed PUBLIC -DCODSPEED_ENABLED)
 
     if(NOT CMAKE_BUILD_TYPE)
         message(
@@ -95,10 +95,10 @@ if(NOT CODSPEED_MODE STREQUAL "off")
     if(CODSPEED_MODE STREQUAL "instrumentation")
         target_compile_definitions(
             codspeed
-            INTERFACE -DCODSPEED_INSTRUMENTATION
+            PUBLIC -DCODSPEED_INSTRUMENTATION
         )
     elseif(CODSPEED_MODE STREQUAL "walltime")
-        target_compile_definitions(codspeed INTERFACE -DCODSPEED_WALLTIME)
+        target_compile_definitions(codspeed PUBLIC -DCODSPEED_WALLTIME)
     else()
         message(
             FATAL_ERROR

core/include/codspeed.h

@@ -1,6 +1,7 @@
 #ifndef CODSPEED_H
 #define CODSPEED_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
@@ -33,7 +34,7 @@ class CodSpeed {
 struct RawWalltimeBenchmark {
   std::string name;
   std::string uri;
-  long iter_per_round;
+  uint64_t iter_per_round;
   double mean_ns;
   double median_ns;
   double stdev_ns;

core/include/measurement.hpp

@@ -3,7 +3,9 @@
 
 #include <string>
 
+#ifdef CODSPEED_INSTRUMENTATION
 #include "callgrind.h"
+#endif
 
 inline std::string get_version() {
 #ifdef CODSPEED_VERSION
@@ -13,6 +15,7 @@ inline std::string get_version() {
 #endif
 }
 
+#ifdef CODSPEED_INSTRUMENTATION
 inline bool measurement_is_instrumented() { return RUNNING_ON_VALGRIND; }
 
 inline void measurement_set_metadata() {
@@ -30,5 +33,12 @@ __attribute__((always_inline)) inline void measurement_stop(
   CALLGRIND_STOP_INSTRUMENTATION;
   CALLGRIND_DUMP_STATS_AT(name.c_str());
 };
+#else
+// Stub implementations for non-instrumentation builds
+inline bool measurement_is_instrumented() { return false; }
+inline void measurement_set_metadata() {}
+inline void measurement_start() {}
+inline void measurement_stop(const std::string &name) { (void)name; }
+#endif
 
 #endif  // MEASUREMENT_H

core/src/codspeed.cpp

@@ -76,7 +76,7 @@ void CodSpeed::start_benchmark(const std::string &name) {
 
   // Sanity check URI and add a placeholder if format is wrong
   if (name.find("::") == std::string::npos) {
-    std::string uri = "unknown_file::" + name;
+    uri = "unknown_file::" + name;
     std::cout << "WARNING: Benchmark name does not contain '::'. Using URI: "
               << uri << std::endl;
   }

core/src/uri.cpp

@@ -46,6 +46,10 @@ std::string extract_lambda_namespace(const std::string &pretty_func) {
   return extract_namespace_clang(pretty_func);
 #elif __GNUC__
   return extract_namespace_gcc(pretty_func);
+#elif _MSC_VER
+  // MSVC doesn't support __PRETTY_FUNCTION__ in the same way
+  // Return empty string as fallback for Windows
+  return {};
 #else
 #error "Unsupported compiler"
 #endif

examples/google_benchmark_cmake/CMakeLists.txt

@@ -6,12 +6,29 @@ project(codspeed_picobench_compat VERSION 0.0.0 LANGUAGES CXX)
 # Treat warnings as errors
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     add_compile_options(-Wall -Wextra -Werror)
+elseif(MSVC)
+    # Set C++17 standard
+    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+    add_compile_options(
+        /W4
+        /WX
+        /wd5051 # Ignore [[maybe_unused]] C++17 warnings from Google Benchmark
+        /wd4038 # Ignore STL <filesystem> C++17 warnings
+    )
 endif()
 
 # On the small benchmarks of this repo, most of the benches will be optimized out, but this is expected.
 set(CMAKE_BUILD_TYPE RelWithDebInfo)
 
-option(BENCHMARK_ENABLE_GTEST_TESTS OFF)
+# Disable Google Benchmark tests for examples
+set(BENCHMARK_ENABLE_GTEST_TESTS
+    OFF
+    CACHE BOOL
+    "Enable testing of the benchmark library."
+    FORCE
+)
 
 FetchContent_Declare(
     google_benchmark

google_benchmark/include/benchmark/benchmark.h

@@ -1459,14 +1459,16 @@ class Fixture : public internal::Benchmark {
 #define BENCHMARK_PRIVATE_CONCAT_NAME(BaseClass, Method) \
   BaseClass##_##Method##_Benchmark
 
-#define BENCHMARK_PRIVATE_DECLARE(n)                                           \
-  /* NOLINTNEXTLINE(misc-use-anonymous-namespace) */                           \
-  static ::benchmark::internal::Benchmark const* const BENCHMARK_PRIVATE_NAME( \
-      n) [[maybe_unused]]
+#define BENCHMARK_PRIVATE_DECLARE(n)                 \
+  /* NOLINTNEXTLINE(misc-use-anonymous-namespace) */ \
+  static ::benchmark::internal::Benchmark const* const BENCHMARK_PRIVATE_NAME(n)
 
 #ifdef CODSPEED_ENABLED
-#define CUR_FILE \
-  codspeed::get_path_relative_to_workspace(__FILE__) + "::"
+#define CUR_FILE codspeed::get_path_relative_to_workspace(__FILE__) + "::"
+#ifdef _MSC_VER
+// TODO: __PRETTY_FUNCTION__ is not available in MSVC and we dont support
+#define __PRETTY_FUNCTION__ "unsupported"
+#endif
 #define NAMESPACE \
   (([]() { return codspeed::extract_lambda_namespace(__PRETTY_FUNCTION__); })())
 #define STATIC_NAMESPACE_STRING(name) static std::string name = NAMESPACE;