[opencv] 15/19: Set of lintain warning fixes for -samples debian package.
Mattia Rizzolo
mattia at debian.org
Tue Oct 4 17:51:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to annotated tag 2.4.12.3
in repository opencv.
commit 42447a7610af61e07e3ee210fcfd62920319751e
Author: Alexander Smorkalov <alexander.smorkalov at itseez.com>
Date: Tue Oct 13 16:32:53 2015 +0300
Set of lintain warning fixes for -samples debian package.
(cherry picked from commit ff002203029220cd63bbb383b3f286a1ee7c35f3)
---
samples/CMakeLists.txt | 2 +-
samples/c/CMakeLists.txt | 7 ++++---
samples/cpp/CMakeLists.txt | 4 ++--
samples/gpu/CMakeLists.txt | 4 ++--
samples/gpu/performance/CMakeLists.txt | 4 ++--
samples/ocl/CMakeLists.txt | 4 ++--
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index d2089de..1754649 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -22,7 +22,7 @@ endif()
if(INSTALL_C_EXAMPLES)
install(FILES "CMakeLists.txt"
DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT samples)
endif()
if(INSTALL_PYTHON_EXAMPLES)
diff --git a/samples/c/CMakeLists.txt b/samples/c/CMakeLists.txt
index 61f2366..cb653c7 100644
--- a/samples/c/CMakeLists.txt
+++ b/samples/c/CMakeLists.txt
@@ -52,8 +52,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
endif()
if (OCV_DEPENDENCIES_FOUND AND INSTALL_C_EXAMPLES AND NOT WIN32)
- file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd *.txt)
+ file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* *.cmd *.txt)
install(FILES ${C_SAMPLES}
- DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/c
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
+ DESTINATION "${OPENCV_SAMPLES_SRC_INSTALL_PATH}/c"
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT samples)
+ install(PROGRAMS build_all.sh DESTINATION "${OPENCV_SAMPLES_SRC_INSTALL_PATH}/c" COMPONENT samples)
endif ()
diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
index 65e402b..fa52ac4 100644
--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
@@ -93,6 +93,6 @@ endif()
if (OCV_DEPENDENCIES_FOUND AND INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd *.txt)
install(FILES ${C_SAMPLES}
- DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/cpp
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
+ DESTINATION "${OPENCV_SAMPLES_SRC_INSTALL_PATH}/cpp"
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT samples)
endif()
diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
index dc7464f..cdf9ee8 100644
--- a/samples/gpu/CMakeLists.txt
+++ b/samples/gpu/CMakeLists.txt
@@ -112,6 +112,6 @@ if (OCV_DEPENDENCIES_FOUND AND INSTALL_C_EXAMPLES AND NOT WIN32)
list_filterout(install_list ".*driver_api_stereo_multi.cpp")
endif()
install(FILES ${install_list}
- DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
+ DESTINATION "${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu"
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT samples)
endif()
diff --git a/samples/gpu/performance/CMakeLists.txt b/samples/gpu/performance/CMakeLists.txt
index 4a1603a..d0810af 100644
--- a/samples/gpu/performance/CMakeLists.txt
+++ b/samples/gpu/performance/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
if(INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB GPU_FILES performance/*.cpp performance/*.h performance/CMakeLists.txt)
install(FILES ${GPU_FILES}
- DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu/performance
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
+ DESTINATION "${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu/performance"
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
COMPONENT samples)
endif()
diff --git a/samples/ocl/CMakeLists.txt b/samples/ocl/CMakeLists.txt
index 10db9b1..706c4ae 100644
--- a/samples/ocl/CMakeLists.txt
+++ b/samples/ocl/CMakeLists.txt
@@ -54,6 +54,6 @@ endif()
if (OCV_DEPENDENCIES_FOUND AND INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd *.txt)
install(FILES ${install_list}
- DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/ocl
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
+ DESTINATION "${OPENCV_SAMPLES_SRC_INSTALL_PATH}/ocl"
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT samples)
endif()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list