From 0c57dc2e00ba0cd9fa650ad8ea3e85526a65cafb Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Tue, 21 Oct 2014 18:48:46 +0400 Subject: [PATCH] rewrite add_test command for accuracy tests: * use new syntax introduced in CMake 2.8.0 * set OPENCV_TEST_DATA_PATH enviroment property --- cmake/OpenCVModule.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake index 4a82402d34..0f9f134850 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -812,11 +812,15 @@ function(ocv_add_accuracy_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests accuracy") endif() - enable_testing() - get_target_property(LOC ${the_target} LOCATION) - add_test(${the_target} "${LOC}") - ocv_add_precompiled_headers(${the_target}) + + if(CMAKE_VERSION VERSION_GREATER "2.8" AND OPENCV_TEST_DATA_PATH) + add_test(NAME ${the_target} COMMAND ${the_target}) + + set_tests_properties(${the_target} PROPERTIES + ENVIRONMENT "OPENCV_TEST_DATA_PATH=${OPENCV_TEST_DATA_PATH}") + endif() + else(OCV_DEPENDENCIES_FOUND) # TODO: warn about unsatisfied dependencies endif(OCV_DEPENDENCIES_FOUND)