From 8b29b136793f3bfdb22fba117527763434363a3f Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Mon, 29 May 2017 16:36:24 +0300 Subject: [PATCH] cmake: fix building bench/bench_cascade under win32 (missing getopt) Because of typo in cmake, now rewrote to make it less error prone (since even for non-win32 there are variables overlap). --- CMakeLists.txt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7075bd47..bd64b445 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -875,25 +875,23 @@ endif() # Benchmarks # macro(add_bench_prog prog) - add_executable(${prog} test/${prog}.c) - if (WIN32) - list(APPEND BENCH_SRC - WIN32-Code/getopt.c - WIN32-Code/getopt_long.c) - endif() - target_link_libraries(${BENCHMARK} + add_executable(${prog} ${ARGN}) + target_link_libraries(${prog} event_extra_static event_core_static ${LIB_APPS} ${LIB_PLATFORM}) - add_dependencies(${BENCHMARK} + add_dependencies(${prog} event_extra_static event_core_static) endmacro() if (NOT EVENT__DISABLE_BENCHMARK) - foreach (BENCHMARK bench bench_cascade bench_http bench_httpclient) - add_bench_prog(${BENCHMARK}) + foreach (BENCHMARK bench_http bench_httpclient) + add_bench_prog(${BENCHMARK} test/${BENCHMARK}.c) endforeach() + + add_bench_prog(bench test/bench.c ${WIN32_GETOPT}) + add_bench_prog(bench_cascade test/bench_cascade.c ${WIN32_GETOPT}) endif() # -- 2.50.1