Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
187befd6
Commit
187befd6
authored
Jan 15, 2015
by
Alexander Smorkalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed installation of CMakeLists.txt and enabled GPU samples build in stand alone version.
parent
3425c90b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
7 deletions
+9
-7
CMakeLists.txt
samples/CMakeLists.txt
+4
-1
CMakeLists.txt
samples/c/CMakeLists.txt
+1
-1
CMakeLists.txt
samples/cpp/CMakeLists.txt
+1
-1
CMakeLists.txt
samples/gpu/CMakeLists.txt
+1
-2
CMakeLists.txt
samples/gpu/performance/CMakeLists.txt
+1
-1
CMakeLists.txt
samples/ocl/CMakeLists.txt
+1
-1
No files found.
samples/CMakeLists.txt
View file @
187befd6
...
...
@@ -19,6 +19,9 @@ if(ANDROID AND BUILD_ANDROID_EXAMPLES)
add_subdirectory
(
android
)
endif
()
install
(
FILES
"CMakeLists.txt"
DESTINATION
${
OPENCV_SAMPLES_SRC_INSTALL_PATH
}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples
)
#
# END OF BUILD CASE 1: Build samples with library sources
...
...
@@ -60,7 +63,7 @@ endif()
add_subdirectory
(
c
)
add_subdirectory
(
cpp
)
add_subdirectory
(
ocl
)
# FIXIT: can't use cvconfig.h in samples:
add_subdirectory(gpu)
add_subdirectory
(
gpu
)
#
# END OF BUILD CASE 2: Build samples with library binaries
...
...
samples/c/CMakeLists.txt
View file @
187befd6
...
...
@@ -52,7 +52,7 @@ 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
)
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
}
/c
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples
)
...
...
samples/cpp/CMakeLists.txt
View file @
187befd6
...
...
@@ -91,7 +91,7 @@ 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
)
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
)
...
...
samples/gpu/CMakeLists.txt
View file @
187befd6
...
...
@@ -101,8 +101,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
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
)
message
(
" install_list:
${
install_list
}
"
)
file
(
GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd *.txt
)
if
(
NOT HAVE_OPENGL
)
list_filterout
(
install_list
".*opengl.cpp"
)
endif
()
...
...
samples/gpu/performance/CMakeLists.txt
View file @
187befd6
...
...
@@ -27,7 +27,7 @@ if(WIN32)
endif
()
if
(
INSTALL_C_EXAMPLES AND NOT WIN32
)
file
(
GLOB GPU_FILES performance/*.cpp performance/*.h
)
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
...
...
samples/ocl/CMakeLists.txt
View file @
187befd6
...
...
@@ -52,7 +52,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
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
)
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment