Moved benchmarks to the tests/ directory

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 : **********")

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)

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)	
+