From 8407d274aa2e67fda11e926d64931911e4fa56cf Mon Sep 17 00:00:00 2001 From: Joris Vaillant <joris.vaillant@inria.fr> Date: Thu, 9 Jan 2025 17:55:42 +0100 Subject: [PATCH] cmake: Fix build without benchmark --- CMakeLists.txt | 4 +++- benchmark/CMakeLists.txt | 7 ++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cf38f4075..c1b4cc8744 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -460,7 +460,9 @@ add_subdirectory(unittest) add_subdirectory(examples) # --- BENCHMARKS --------------------------------------------------------------- -add_subdirectory(benchmark) +if(BUILD_BENCHMARK) + add_subdirectory(benchmark) +endif() # --- PACKAGING ---------------------------------------------------------------- macro(EXPORT_VARIABLE var_name var_value) diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index 06f5cef563..28c462c3d9 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -6,6 +6,7 @@ # --- BENCHMARK -------------------------------------- # ---------------------------------------------------- add_custom_target(bench) + add_project_private_dependency(benchmark REQUIRED) macro(ADD_PINOCCHIO_BENCH bench_name) @@ -14,11 +15,7 @@ macro(ADD_PINOCCHIO_BENCH bench_name) set(multiValueArgs PACKAGES) cmake_parse_arguments(unit_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if(BUILD_BENCHMARK) - add_executable(${bench_name} ${bench_name}.cpp) - else() - add_executable(${bench_name} EXCLUDE_FROM_ALL ${bench_name}.cpp) - endif() + add_executable(${bench_name} ${bench_name}.cpp) target_compile_definitions(${bench_name} PRIVATE PINOCCHIO_MODEL_DIR="${PINOCCHIO_MODEL_DIR}") if(NOT unit_test_HEADER_ONLY)