Merge of #152

Author: mergify[bot]

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "benchmark"]
-	path = tests/benchmark
-	url = https://github.com/google/benchmark

flake.lock

@@ -12,7 +12,13 @@
           { pkgs-final, drv-prev, ... }:
           {
             src = lib.cleanSource ./.;
-            nativeBuildInputs = drv-prev.nativeBuildInputs ++ [ pkgs-final.jrl-cmakemodules ];
+            nativeBuildInputs = drv-prev.nativeBuildInputs ++ [
+              pkgs-final.jrl-cmakemodules
+              pkgs-final.gbenchmark
+            ];
+            cmakeFlags = (drv-prev.cmakeFlags or [ ]) ++ [
+              (lib.cmakeBool "BENCHMARKS" true)
+            ];
           };
       }
     );

flake.nix

@@ -40,7 +40,7 @@ endmacro(addParserUnitTest)
 
 macro(addBenchmark name)
   add_executable(${name} ${name}.cpp ${HEADERS})
-  target_link_libraries(${name} PUBLIC RBDyn benchmark)
+  target_link_libraries(${name} PRIVATE RBDyn benchmark::benchmark)
   # Adding a project configuration file (for MSVC only)
   generate_msvc_dot_user_file(${name})
 endmacro(addBenchmark)
@@ -64,12 +64,12 @@ addparserunittest("YAMLParserTest")
 addparserunittest("YAMLOutputTest")
 
 if(${BENCHMARKS})
+  find_package(benchmark REQUIRED)
   option(BENCHMARK_ENABLE_TESTING "Enable testing of the benchmark library."
          OFF)
   if(NOT WIN32)
     add_definitions(-Wno-error)
   endif()
-  add_subdirectory(benchmark EXCLUDE_FROM_ALL)
   addbenchmark("JacobianBench")
   addbenchmark("DynamicsBench")
 endif()

tests/CMakeLists.txt

@@ -74,4 +74,4 @@ static void BM_Coriolis(benchmark::State & state)
 }
 BENCHMARK(BM_Coriolis);
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();

tests/DynamicsBench.cpp

@@ -233,4 +233,4 @@ static void BM_MomentumJacobian_jacobianDot(benchmark::State & state)
 }
 BENCHMARK(BM_MomentumJacobian_jacobianDot);
 
-BENCHMARK_MAIN()
+BENCHMARK_MAIN();