Merge pull request #7896 from alalek:fix_add_testdata

pull/7687/head
Alexander Alekhin 8 years ago
commit 5a07e102fa
  1. 4
      cmake/OpenCVUtils.cmake

@ -1098,16 +1098,16 @@ endfunction()
macro(ocv_add_testdata basedir dest_subdir) macro(ocv_add_testdata basedir dest_subdir)
if(BUILD_TESTS) if(BUILD_TESTS)
cmake_parse_arguments(__TESTDATA "" "COMPONENT" "" ${ARGN})
if(NOT CMAKE_CROSSCOMPILING AND NOT INSTALL_TESTS) if(NOT CMAKE_CROSSCOMPILING AND NOT INSTALL_TESTS)
file(COPY ${basedir}/ file(COPY ${basedir}/
DESTINATION ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}/${dest_subdir} DESTINATION ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}/${dest_subdir}
${__TESTDATA_UNPARSED_ARGUMENTS} ${ARGN}
) )
endif() endif()
if(INSTALL_TESTS) if(INSTALL_TESTS)
install(DIRECTORY ${basedir}/ install(DIRECTORY ${basedir}/
DESTINATION ${OPENCV_TEST_DATA_INSTALL_PATH}/contrib/text DESTINATION ${OPENCV_TEST_DATA_INSTALL_PATH}/contrib/text
COMPONENT "tests"
${ARGN} ${ARGN}
) )
endif() endif()

Loading…
Cancel
Save