diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | DefineOptions.cmake | 3 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/benchmarks/CMakeLists.txt (renamed from benchmarks/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | tests/benchmarks/bench1.sh (renamed from benchmarks/bench1.sh) | 0 | ||||
| -rwxr-xr-x | tests/benchmarks/bench2.sh (renamed from benchmarks/bench2.sh) | 0 | ||||
| -rw-r--r-- | tests/benchmarks/bench_scp.c (renamed from benchmarks/bench_scp.c) | 0 | ||||
| -rw-r--r-- | tests/benchmarks/benchmarks.c (renamed from benchmarks/benchmarks.c) | 0 | ||||
| -rw-r--r-- | tests/benchmarks/benchmarks.h (renamed from benchmarks/benchmarks.h) | 0 | ||||
| -rw-r--r-- | tests/benchmarks/latency.c (renamed from benchmarks/latency.c) | 0 |
10 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d57317f..86e80ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,9 +97,6 @@ if (WITH_TESTING) add_subdirectory(tests) endif (WITH_TESTING) -if (WITH_BENCHMARKS) - add_subdirectory(benchmarks) -endif (WITH_BENCHMARKS) message(STATUS "********************************************") message(STATUS "********** ${PROJECT_NAME} build options : **********") diff --git a/DefineOptions.cmake b/DefineOptions.cmake index 17abbd1..d82588c 100644 --- a/DefineOptions.cmake +++ b/DefineOptions.cmake @@ -14,3 +14,6 @@ option(WITH_BENCHMARKS "Build benchmarks tools" OFF) if (WITH_TESTING) set(WITH_STATIC_LIB ON) endif (WITH_TESTING) +if(WITH_BENCHMARKS) + set(WITH_TESTING ON) +endif(WITH_BENCHMARKS)
\ No newline at end of file diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 56980ab..da1fb41 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -32,3 +32,8 @@ add_subdirectory(unittests) if (WITH_CLIENT_TESTING) add_subdirectory(client) endif (WITH_CLIENT_TESTING) + +if (WITH_BENCHMARKS) + add_subdirectory(benchmarks) +endif (WITH_BENCHMARKS) + diff --git a/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt index 5b2b808..5b2b808 100644 --- a/benchmarks/CMakeLists.txt +++ b/tests/benchmarks/CMakeLists.txt diff --git a/benchmarks/bench1.sh b/tests/benchmarks/bench1.sh index 4458e9a..4458e9a 100644 --- a/benchmarks/bench1.sh +++ b/tests/benchmarks/bench1.sh diff --git a/benchmarks/bench2.sh b/tests/benchmarks/bench2.sh index 01d6777..01d6777 100755 --- a/benchmarks/bench2.sh +++ b/tests/benchmarks/bench2.sh diff --git a/benchmarks/bench_scp.c b/tests/benchmarks/bench_scp.c index 3ef3bbf..3ef3bbf 100644 --- a/benchmarks/bench_scp.c +++ b/tests/benchmarks/bench_scp.c diff --git a/benchmarks/benchmarks.c b/tests/benchmarks/benchmarks.c index 44ddb5d..44ddb5d 100644 --- a/benchmarks/benchmarks.c +++ b/tests/benchmarks/benchmarks.c diff --git a/benchmarks/benchmarks.h b/tests/benchmarks/benchmarks.h index fa32c9c..fa32c9c 100644 --- a/benchmarks/benchmarks.h +++ b/tests/benchmarks/benchmarks.h diff --git a/benchmarks/latency.c b/tests/benchmarks/latency.c index 1737945..1737945 100644 --- a/benchmarks/latency.c +++ b/tests/benchmarks/latency.c |