Tony
8fd11f477b
Fix logic error in OpenCVFindLibsGUI.cmake
...
When with_gtk is selected but GTK3 is not present the current logic
fails to check for GTK2. This edit corrects this.
11 years ago
Tony
2f9dad5ce8
Correct error with GTK3 not found selection
...
When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit
ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum
version requirements) is present.
Selection logic for printing 'GTK: No' when the libraries are not found
has also been removed so the message is printed when GTK is not found or
selected in common with other libraries.
Changes committed:
modified: CMakeLists.txt
modified: cmake/OpenCVFindLibsGUI.cmake
11 years ago
Alexander Alekhin
1461ab41bc
ipp: added support for updated ICV package
11 years ago
Ilya Lavrenov
444ab0ef0d
fixed (IppiSize&)sz
11 years ago
Ilya Lavrenov
c735594178
cv::scaleAdd
11 years ago
Ilya Lavrenov
f1b38c4198
cv::warpPerspective and cv::warpAffine
11 years ago
vbystricky
e8f79d6e1f
Fix rebase errors
11 years ago
vbystricky
1b3651d8ee
Undo changes ipp to ippicv prefix of function names
11 years ago
vbystricky
01a66a2938
Prepare codes for ippicv library
11 years ago
Alexander Alekhin
bfc546d23c
enable IPP ICV support
11 years ago
Elena Gvozdeva
037ac27ec8
Added SharedMatrix
11 years ago
Tony
7daec9e9a8
Improve GTK+ library selection logic.
...
The new logic will select GTK+3 by default if WITH_GTK is selected. If
the GTK+3 libraries are not found, then GTK+2 libraries will be selected
if found.
This can be overridden by using WITH_GTK_2_X to force selection of GTK+2
(if found).
11 years ago
Elena Gvozdeva
fa2d79a15b
Added IPP Async converters, doc and sample
11 years ago
Tony
7f671406db
Use GTK_VERSION_MAJOR to switch between GTK+ version two and three
...
specific code. As a result of this, HAVE_GTK3 no longer needs to be
exposed.
The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the
method used by HAVE_QT and HAVE_QT5.
On branch gtk3
Changes to be committed:
modified: CMakeLists.txt
modified: cmake/OpenCVFindLibsGUI.cmake
modified: cmake/templates/cvconfig.h.in
modified: modules/highgui/src/window.cpp
modified: modules/highgui/src/window_gtk.cpp
11 years ago
Alexander Smorkalov
b852108262
OpenCVConfig.cmake fix after cutting absolute CUDA libraries path.
11 years ago
Alexander Smorkalov
64d679ecb4
Added guard to prevent from gpu module redefinition in OpenCV.mk
11 years ago
Alexander Smorkalov
b0ad84cfa2
Libraries filter update after abs path cut.
11 years ago
Alexander Smorkalov
284b2fc1e7
Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path.
11 years ago
Alexander Smorkalov
b4e4f13f9e
Superres module enabled for Android. GPU samples build fixed for Android.
11 years ago
Alexander Smorkalov
6b8de222d7
OpenCV_MODULES_SUFFIX variable added to OpenCVConfig.cmake to enable custom module configurations.
11 years ago
Anatoly Baksheev
4d7a593c25
minor cmake fix fo macos
11 years ago
Alexander Smorkalov
b3e18d23a3
Implicit CUDA and OpenCL control for module definition added.
...
Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used
on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.
11 years ago
Nicolas Martin
67cf0dabea
Do not build apple objective-c codes if using gcc
11 years ago
Alexander Smorkalov
de6d13088f
gcov tool support added.
11 years ago
Alexander Karsakov
01a980aa9e
Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.
11 years ago
Vladislav Vinogradov
8b8c368148
fixed two warnings in gpu sources (-Wshadow, -Wno-sign-promo)
11 years ago
Stuart Cunningham
55b9c0374c
Fix cmake detection of build platform endianness
...
Improve comments to indicate actual usage of WORDS_BIGENDIAN where
it is tested with #ifdef rather than #if
11 years ago
Alexander Smorkalov
116311b7b4
opencv_run_all_tests.sh implemented for Android SDK.
...
(cherry picked from commit d02c291160
)
11 years ago
Alexander Smorkalov
d02c291160
opencv_run_all_tests.sh implemented for Android SDK.
11 years ago
Ilya Lavrenov
281666887e
typo
11 years ago
Alexander Smorkalov
f9e9ae85bd
dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.
...
(cherry picked from commit b10d4b05ed
)
11 years ago
Alexander Smorkalov
a49beb7c73
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
(cherry picked from commit 6ae4a9b09b
)
11 years ago
Alexander Smorkalov
51dff5b9e8
project.properties file generation fixed for per-component installation.
...
(cherry picked from commit 65b4d77959
)
11 years ago
Vladislav Vinogradov
c10692deff
save previous values of LOCAL_* variables and restore them at the end(cherry picked from commit 286fe261d0
)
11 years ago
Vladislav Vinogradov
daa7b9ce5f
fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)(cherry picked from commit a098fb1803
)
11 years ago
Anatoly Baksheev
5dc17f5d58
Fixed all OpenGL issues for Macos (via objective-C++ layer)
11 years ago
Anatoly Baksheev
975a6299fa
More proper OpneCv+Qt+Vtk issues handling ( http://code.opencv.org/issues/3492 )
11 years ago
Alexander Smorkalov
b10d4b05ed
dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.
11 years ago
Alexander Smorkalov
bc653add74
Absolute path to tests in opencv_run_app_tests.sh fixed.
...
(cherry picked from commit 530702c5f2
)
11 years ago
Alexander Smorkalov
6ae4a9b09b
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
11 years ago
Alexander Smorkalov
530702c5f2
Absolute path to tests in opencv_run_app_tests.sh fixed.
11 years ago
Alexander Smorkalov
65b4d77959
project.properties file generation fixed for per-component installation.
11 years ago
Ilya Lavrenov
c7fe162829
renamed **2 -> **
11 years ago
Vladislav Vinogradov
286fe261d0
save previous values of LOCAL_* variables and restore them at the end
11 years ago
Vladislav Vinogradov
a098fb1803
fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)
11 years ago
Anatoly Baksheev
0a870faf28
added guard against linking qt5 and VTK together
11 years ago
Alexander Smorkalov
ed10f50d25
Reports path fix for opencv_run_all_tests.sh.in script.
...
(cherry picked from commit 3d261e8a01
)
11 years ago
Alexander Smorkalov
3d261e8a01
Reports path fix for opencv_run_all_tests.sh.in script.
11 years ago
Roman Donchenko
0dad2876e2
Removed all use of the obsolete IMMEDIATE parameter to configure_file.
...
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):
https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
11 years ago
Alexander Smorkalov
514b714cc2
opencv_run_all_tests.sh script added to -tests package.
...
(cherry picked from commit d45350a06a
)
11 years ago