Merge pull request opencv#9227 from alalek:cmake_fix_ocv_add_testdata

alalek · alalek · commit 8e6e05ed3f15 · 2017-07-25T15:56:57.000Z
diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
@@ -1116,7 +1116,7 @@ macro(ocv_add_testdata basedir dest_subdir)
     endif()
     if(INSTALL_TESTS)
       install(DIRECTORY ${basedir}/
-              DESTINATION ${OPENCV_TEST_DATA_INSTALL_PATH}/contrib/text
+              DESTINATION ${OPENCV_TEST_DATA_INSTALL_PATH}/${dest_subdir}
               COMPONENT "tests"
               ${ARGN}
       )

Original file line number	Diff line number	Diff line change
`@@ -1116,7 +1116,7 @@ macro(ocv_add_testdata basedir dest_subdir)`
`1116`	`1116`	`endif()`
`1117`	`1117`	`if(INSTALL_TESTS)`
`1118`	`1118`	`install(DIRECTORY ${basedir}/`
`1119`		`- DESTINATION ${OPENCV_TEST_DATA_INSTALL_PATH}/contrib/text`
	`1119`	`+ DESTINATION ${OPENCV_TEST_DATA_INSTALL_PATH}/${dest_subdir}`
`1120`	`1120`	`COMPONENT "tests"`
`1121`	`1121`	`${ARGN}`
`1122`	`1122`	`)`