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

OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.

Browse Source
This commit is contained in:
Alexander Smorkalov
2014-01-27 14:20:30 +04:00
parent d093cb54d5
commit f332cba14b
10 changed files with 82 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/c/CMakeLists.txt
View File

@@ -53,7 +53,13 @@ endif()
if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${C_SAMPLES}
DESTINATION share/OpenCV/samples/c
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
if (ANDROID)
install(FILES ${C_SAMPLES}
DESTINATION samples/native/c
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
else()
install(FILES ${C_SAMPLES}
DESTINATION share/OpenCV/samples/c
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
endif()
endif ()

12
samples/cpp/CMakeLists.txt
View File

@@ -90,7 +90,13 @@ endif()
if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${C_SAMPLES}
DESTINATION share/OpenCV/samples/cpp
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
if (ANDROID)
install(FILES ${C_SAMPLES}
DESTINATION samples/native/cpp
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
else()
install(FILES ${C_SAMPLES}
DESTINATION share/OpenCV/samples/cpp
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
endif()
endif()

12
samples/gpu/CMakeLists.txt
View File

@@ -82,7 +82,13 @@ endif()
if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${install_list}
DESTINATION share/OpenCV/samples/${project}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
if(ANDROID)
install(FILES ${install_list}
DESTINATION samples/native/gpu
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
else()
install(FILES ${install_list}
DESTINATION share/OpenCV/samples/gpu
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
endif()
endif()

3
samples/gpu/performance/CMakeLists.txt
View File

@@ -30,5 +30,6 @@ if(INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB GPU_FILES performance/*.cpp performance/*.h)
install(FILES ${GPU_FILES}
DESTINATION share/OpenCV/samples/gpu/performance
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
COMPONENT samples)
endif()

12
samples/ocl/CMakeLists.txt
View File

@@ -53,7 +53,13 @@ endif()
if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${install_list}
DESTINATION share/OpenCV/samples/${project}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
if(ANDROID)
install(FILES ${install_list}
DESTINATION samples/native/ocl
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
else()
install(FILES ${install_list}
DESTINATION share/OpenCV/samples/ocl
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
endif()
endif()