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
a323da6f
Commit
a323da6f
authored
Jun 27, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some warnings and install problems on linux
parent
981564ff
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
26 deletions
+25
-26
CMakeLists.txt
CMakeLists.txt
+1
-0
window_gtk.cpp
modules/highgui/src/window_gtk.cpp
+1
-1
motion_stabilizing.cpp
modules/videostab/src/motion_stabilizing.cpp
+1
-1
CMakeLists.txt
samples/CMakeLists.txt
+4
-6
CMakeLists.txt
samples/c/CMakeLists.txt
+4
-4
CMakeLists.txt
samples/cpp/CMakeLists.txt
+5
-5
CMakeLists.txt
samples/gpu/CMakeLists.txt
+5
-5
CMakeLists.txt
samples/gpu/performance/CMakeLists.txt
+4
-4
No files found.
CMakeLists.txt
View file @
a323da6f
...
...
@@ -37,6 +37,7 @@ if(NOT CMAKE_TOOLCHAIN_FILE)
else
(
NOT CMAKE_TOOLCHAIN_FILE
)
#Android: set output folder to ${CMAKE_BINARY_DIR}
set
(
LIBRARY_OUTPUT_PATH_ROOT
${
CMAKE_BINARY_DIR
}
CACHE PATH
"root for library output, set this to change where android libs are compiled to"
)
# any crosscompiling
set
(
CMAKE_INSTALL_PREFIX
"
${
CMAKE_BINARY_DIR
}
/install"
CACHE PATH
"Installation Directory"
)
endif
(
NOT CMAKE_TOOLCHAIN_FILE
)
...
...
modules/highgui/src/window_gtk.cpp
View file @
a323da6f
...
...
@@ -851,7 +851,7 @@ namespace
__END__
;
}
void
GlFuncTab_GTK
::
generateBitmapFont
(
const
std
::
string
&
family
,
int
height
,
int
weight
,
bool
italic
,
bool
underline
,
int
start
,
int
count
,
int
base
)
const
void
GlFuncTab_GTK
::
generateBitmapFont
(
const
std
::
string
&
family
,
int
height
,
int
weight
,
bool
italic
,
bool
/*underline*/
,
int
start
,
int
count
,
int
base
)
const
{
PangoFontDescription
*
fontDecr
;
PangoFont
*
pangoFont
;
...
...
modules/videostab/src/motion_stabilizing.cpp
View file @
a323da6f
...
...
@@ -142,7 +142,7 @@ void LpMotionStabilizer::stabilize(int, const vector<Mat>&, pair<int,int>, Mat*)
#else
void
LpMotionStabilizer
::
stabilize
(
int
size
,
const
vector
<
Mat
>
&
motions
,
pair
<
int
,
int
>
range
,
Mat
*
stabilizationMotions
)
int
size
,
const
vector
<
Mat
>
&
motions
,
pair
<
int
,
int
>
/*range*/
,
Mat
*
stabilizationMotions
)
{
CV_Assert
(
model_
<=
MM_AFFINE
);
...
...
samples/CMakeLists.txt
View file @
a323da6f
# ----------------------------------------------------------------------------
# CMake file for samples. See root CMakeLists.txt
# CMake file for samples. See root CMakeLists.txt
#
# ----------------------------------------------------------------------------
if
(
NOT ANDROID
)
add_subdirectory
(
c
)
add_subdirectory
(
cpp
)
add_subdirectory
(
gpu
)
endif
()
add_subdirectory
(
c
)
add_subdirectory
(
cpp
)
add_subdirectory
(
gpu
)
if
(
ANDROID AND BUILD_ANDROID_EXAMPLES
)
add_subdirectory
(
android
)
...
...
samples/c/CMakeLists.txt
View file @
a323da6f
...
...
@@ -15,7 +15,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
if
(
CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Wno-unused-function"
)
endif
()
ocv_include_modules
(
${
OPENCV_C_SAMPLES_REQUIRED_DEPS
}
)
# ---------------------------------------------
...
...
@@ -42,9 +42,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
RUNTIME DESTINATION
"samples/c"
COMPONENT main
)
endif
()
ENDMACRO
()
file
(
GLOB cpp_samples RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cpp *.c
)
foreach
(
sample_filename
${
cpp_samples
}
)
get_filename_component
(
sample
${
sample_filename
}
NAME_WE
)
OPENCV_DEFINE_C_EXAMPLE
(
${
sample
}
${
sample_filename
}
)
...
...
@@ -54,7 +54,7 @@ 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
DESTINATION share/
OpenCV
/samples/c
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
)
endif
()
samples/cpp/CMakeLists.txt
View file @
a323da6f
...
...
@@ -23,7 +23,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
if
(
CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Wno-unused-function"
)
endif
()
# ---------------------------------------------
# Define executable targets
# ---------------------------------------------
...
...
@@ -39,7 +39,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
set_target_properties
(
${
the_target
}
PROPERTIES
OUTPUT_NAME
"
${
name
}
"
PROJECT_LABEL
"(EXAMPLE)
${
name
}
"
)
if
(
ENABLE_SOLUTION_FOLDERS
)
set_target_properties
(
${
the_target
}
PROPERTIES FOLDER
"samples//cpp"
)
endif
()
...
...
@@ -52,9 +52,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
RUNTIME DESTINATION
"samples/cpp"
COMPONENT main
)
endif
()
ENDMACRO
()
file
(
GLOB cpp_samples RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cpp
)
foreach
(
sample_filename
${
cpp_samples
}
)
get_filename_component
(
sample
${
sample_filename
}
NAME_WE
)
OPENCV_DEFINE_CPP_EXAMPLE
(
${
sample
}
${
sample_filename
}
)
...
...
@@ -64,7 +64,7 @@ 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
DESTINATION share/
OpenCV
/samples/cpp
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
)
endif
()
samples/gpu/CMakeLists.txt
View file @
a323da6f
...
...
@@ -8,7 +8,7 @@ ocv_check_dependencies(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})
if
(
BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND
)
set
(
project
"gpu"
)
string
(
TOUPPER
"
${
project
}
"
project_upper
)
project
(
"
${
project
}
_samples"
)
ocv_include_modules
(
${
OPENCV_GPU_SAMPLES_REQUIRED_DEPS
}
)
...
...
@@ -35,9 +35,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
target_link_libraries
(
${
the_target
}
${
OPENCV_LINKER_LIBS
}
${
OPENCV_GPU_SAMPLES_REQUIRED_DEPS
}
)
set_target_properties
(
${
the_target
}
PROPERTIES
OUTPUT_NAME
"
${
name
}
_
${
project
}
"
OUTPUT_NAME
"
${
name
}
_
${
project
}
"
PROJECT_LABEL
"(EXAMPLE_
${
project_upper
}
)
${
name
}
"
)
if
(
ENABLE_SOLUTION_FOLDERS
)
set_target_properties
(
${
the_target
}
PROPERTIES FOLDER
"samples//
${
project
}
"
)
endif
()
...
...
@@ -61,10 +61,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
include
(
"performance/CMakeLists.txt"
)
endif
()
if
(
NOT WIN32
)
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
}
DESTINATION share/
OpenCV
/samples/
${
project
}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
)
endif
()
samples/gpu/performance/CMakeLists.txt
View file @
a323da6f
...
...
@@ -9,18 +9,18 @@ target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_GPU_SAMPLES_R
set_target_properties
(
${
the_target
}
PROPERTIES
OUTPUT_NAME
"performance_gpu"
PROJECT_LABEL
"(EXAMPLE_GPU) performance"
)
if
(
ENABLE_SOLUTION_FOLDERS
)
set_target_properties
(
${
the_target
}
PROPERTIES FOLDER
"samples//gpu"
)
endif
()
endif
()
if
(
WIN32
)
install
(
TARGETS
${
the_target
}
RUNTIME DESTINATION
"samples/gpu"
COMPONENT main
)
endif
()
if
(
NOT WIN32
)
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
DESTINATION share/
OpenCV
/samples/gpu/performance
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
)
endif
()
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