From f1ee656657a75542f00ec82c235f05449f8e803e Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Mon, 18 Aug 2014 23:30:30 -0400 Subject: [PATCH] Renamed benchmarks directory to prevent conflicts if cmake is called from main dir --- src/misc_utilities/CMakeLists.txt | 6 +++--- src/misc_utilities/{benchmark => benchmarks}/benchmark.cpp | 0 .../{benchmark => benchmarks}/benchmark_utils.cpp | 0 .../{benchmark => benchmarks}/benchmark_utils.h | 0 .../{benchmark => benchmarks}/endtoendtest.cpp | 0 src/misc_utilities/{benchmark => benchmarks}/endtoendtest.h | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename src/misc_utilities/{benchmark => benchmarks}/benchmark.cpp (100%) rename src/misc_utilities/{benchmark => benchmarks}/benchmark_utils.cpp (100%) rename src/misc_utilities/{benchmark => benchmarks}/benchmark_utils.h (100%) rename src/misc_utilities/{benchmark => benchmarks}/endtoendtest.cpp (100%) rename src/misc_utilities/{benchmark => benchmarks}/endtoendtest.h (100%) diff --git a/src/misc_utilities/CMakeLists.txt b/src/misc_utilities/CMakeLists.txt index 0bc2e53..210fcfc 100644 --- a/src/misc_utilities/CMakeLists.txt +++ b/src/misc_utilities/CMakeLists.txt @@ -21,9 +21,9 @@ TARGET_LINK_LIBRARIES(classifychars ADD_EXECUTABLE(benchmark EXCLUDE_FROM_ALL - benchmark/benchmark.cpp - benchmark/benchmark_utils.cpp - benchmark/endtoendtest.cpp + benchmarks/benchmark.cpp + benchmarks/benchmark_utils.cpp + benchmarks/endtoendtest.cpp ) TARGET_LINK_LIBRARIES(benchmark openalpr-static diff --git a/src/misc_utilities/benchmark/benchmark.cpp b/src/misc_utilities/benchmarks/benchmark.cpp similarity index 100% rename from src/misc_utilities/benchmark/benchmark.cpp rename to src/misc_utilities/benchmarks/benchmark.cpp diff --git a/src/misc_utilities/benchmark/benchmark_utils.cpp b/src/misc_utilities/benchmarks/benchmark_utils.cpp similarity index 100% rename from src/misc_utilities/benchmark/benchmark_utils.cpp rename to src/misc_utilities/benchmarks/benchmark_utils.cpp diff --git a/src/misc_utilities/benchmark/benchmark_utils.h b/src/misc_utilities/benchmarks/benchmark_utils.h similarity index 100% rename from src/misc_utilities/benchmark/benchmark_utils.h rename to src/misc_utilities/benchmarks/benchmark_utils.h diff --git a/src/misc_utilities/benchmark/endtoendtest.cpp b/src/misc_utilities/benchmarks/endtoendtest.cpp similarity index 100% rename from src/misc_utilities/benchmark/endtoendtest.cpp rename to src/misc_utilities/benchmarks/endtoendtest.cpp diff --git a/src/misc_utilities/benchmark/endtoendtest.h b/src/misc_utilities/benchmarks/endtoendtest.h similarity index 100% rename from src/misc_utilities/benchmark/endtoendtest.h rename to src/misc_utilities/benchmarks/endtoendtest.h