generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code review notes fixed.

Browse Source 
Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated.
This commit is contained in:
Alexander Smorkalov
2014-01-27 17:57:11 +04:00
parent f332cba14b
commit 39201e68e2
9 changed files with 22 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/OpenCVModule.cmake
View File

@@ -712,11 +712,7 @@ function(ocv_add_perf_tests)
# TODO: warn about unsatisfied dependencies
endif(OCV_DEPENDENCIES_FOUND)
if(INSTALL_TESTS)
if(ANDROID)
install(TARGETS ${the_target} RUNTIME DESTINATION sdk/etc/bin COMPONENT tests)
elseif(NOT WIN32)
install(TARGETS ${the_target} RUNTIME DESTINATION share/OpenCV/bin COMPONENT tests)
endif()
install(TARGETS ${the_target} RUNTIME DESTINATION ${OPENCV_BIN_INSTALL_PATH} COMPONENT tests)
endif()
endif()
endfunction()
@@ -773,11 +769,7 @@ function(ocv_add_accuracy_tests)
endif(OCV_DEPENDENCIES_FOUND)
if(INSTALL_TESTS)
if(ANDROID)
install(TARGETS ${the_target} RUNTIME DESTINATION sdk/etc/bin COMPONENT tests)
elseif(NOT WIN32)
install(TARGETS ${the_target} RUNTIME DESTINATION share/OpenCV/bin COMPONENT tests)
endif()
install(TARGETS ${the_target} RUNTIME DESTINATION ${OPENCV_BIN_INSTALL_PATH} COMPONENT tests)
endif()
endif()
endfunction()
@@ -819,7 +811,7 @@ function(ocv_add_samples)
if(INSTALL_C_EXAMPLES AND NOT WIN32 AND EXISTS "${samples_path}")
file(GLOB sample_files "${samples_path}/*")
install(FILES ${sample_files}
DESTINATION share/OpenCV/samples/${module_id}
DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/${module_id}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
endif()
endfunction()