From aa6c677bd8f079eff0d97511b3e29333359a32d0 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Fri, 2 Mar 2012 08:48:33 +0000 Subject: [PATCH] Added opencv_tests and opencv_perf_tests targets to simplify building tests only --- cmake/OpenCVExtraTargets.cmake | 46 ++++++++++++++++++++++++++++++------------ cmake/OpenCVModule.cmake | 2 ++ 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/cmake/OpenCVExtraTargets.cmake b/cmake/OpenCVExtraTargets.cmake index c421eb7..063a4d5 100644 --- a/cmake/OpenCVExtraTargets.cmake +++ b/cmake/OpenCVExtraTargets.cmake @@ -37,17 +37,37 @@ endif() # performance tests, for "make perf" #----------------------------------- if(BUILD_PERF_TESTS AND PYTHON_EXECUTABLE) - if(CMAKE_VERSION VERSION_GREATER "2.8.2") - add_custom_target(perf - ${PYTHON_EXECUTABLE} "${OpenCV_SOURCE_DIR}/modules/ts/misc/run.py" --configuration $ "${CMAKE_BINARY_DIR}" - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - DEPENDS "${OpenCV_SOURCE_DIR}/modules/ts/misc/run.py" - ) - else() - add_custom_target(perf - ${PYTHON_EXECUTABLE} "${OpenCV_SOURCE_DIR}/modules/ts/misc/run.py" "${CMAKE_BINARY_DIR}" - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - DEPENDS "${OpenCV_SOURCE_DIR}/modules/ts/misc/run.py" - ) - endif() + if(CMAKE_VERSION VERSION_GREATER "2.8.2") + add_custom_target(perf + ${PYTHON_EXECUTABLE} "${OpenCV_SOURCE_DIR}/modules/ts/misc/run.py" --configuration $ "${CMAKE_BINARY_DIR}" + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + DEPENDS "${OpenCV_SOURCE_DIR}/modules/ts/misc/run.py" + ) + else() + add_custom_target(perf + ${PYTHON_EXECUTABLE} "${OpenCV_SOURCE_DIR}/modules/ts/misc/run.py" "${CMAKE_BINARY_DIR}" + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + DEPENDS "${OpenCV_SOURCE_DIR}/modules/ts/misc/run.py" + ) + endif() + if(ENABLE_SOLUTION_FOLDERS) + set_target_properties(perf PROPERTIES FOLDER "tests performance") + endif() endif() + +#----------------------------------- +# spefial targets to build all tests +#----------------------------------- +if(BUILD_TESTS) + add_custom_target(opencv_tests) + if(ENABLE_SOLUTION_FOLDERS) + set_target_properties(opencv_tests PROPERTIES FOLDER "tests accuracy") + endif() +endif() +if(BUILD_PERF_TESTS) + add_custom_target(opencv_perf_tests) + if(ENABLE_SOLUTION_FOLDERS) + set_target_properties(opencv_perf_tests PROPERTIES FOLDER "tests performance") + endif() +endif() + diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake index 3240144..d8f033f 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -541,6 +541,7 @@ macro(ocv_add_perf_tests) add_executable(${the_target} ${OPENCV_PERF_${the_module}_SOURCES}) target_link_libraries(${the_target} ${OPENCV_MODULE_${the_module}_DEPS} ${perf_deps} ${OPENCV_LINKER_LIBS}) + add_dependencies(opencv_perf_tests ${the_target}) # Additional target properties set_target_properties(${the_target} PROPERTIES @@ -591,6 +592,7 @@ macro(ocv_add_accuracy_tests) add_executable(${the_target} ${OPENCV_TEST_${the_module}_SOURCES}) target_link_libraries(${the_target} ${OPENCV_MODULE_${the_module}_DEPS} ${test_deps} ${OPENCV_LINKER_LIBS}) + add_dependencies(opencv_tests ${the_target}) # Additional target properties set_target_properties(${the_target} PROPERTIES -- 2.7.4