Vincent Rabaud
eabcfa5652
reorder the if's for clarity
11 years ago
Vincent Rabaud
6cb90c0e97
fix cross-compilation issue with Numpy
11 years ago
Anatoly Baksheev
02ebc4368c
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
11 years ago
Anatoly Baksheev
8d327fa497
updated for compatibility with VTK6.0
11 years ago
Roman Donchenko
9e3673ef53
Don't use PYTHON_VERSION_STRING when searching for Python libraries
...
It may be an arbitrary string, and, for example, in Ubuntu 13.10
it's set to "2.7.5+", which breaks the find script.
11 years ago
Ilya Lavrenov
7852b2f155
updated docs according to the last changes
11 years ago
Ilya Lavrenov
118709fd9f
added OpenCL accelerated warpers
11 years ago
Alexander Smorkalov
c48777a1c3
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
11 years ago
GregoryMorse
4880858119
Update CMakeLists.txt
...
WinRT native C++ support allowing building of static libraries
Update CMakeLists.txt
Update OpenCVCRTLinkage.cmake
Update OpenCVCRTLinkage.cmake
11 years ago
Alexander Smorkalov
358e59e91b
Fake dependency from CUDA in case of satic linkage with OpenCV removed.
11 years ago
Roman Donchenko
83fe2f3b16
Fixed the seporate/seporator typo everywhere.
11 years ago
Alexander Smorkalov
51d3138dff
OCV option ENABLE_DYNAMIC_CUDA mistake fix.
11 years ago
Alexander Smorkalov
58e7d9f32f
OpenCV.mk fixed for accurate CUDA support.
11 years ago
Alexander Smorkalov
9941c6710d
NEON instruction set control unified for regular and cross-compiler builds.
11 years ago
Alexander Smorkalov
037ffcdf99
Dynamic CUDA support library reimplemented as OpenCV module.
11 years ago
Vladimir Bystricky
d449ba104a
Fix comment in the cmake file from SSDK to SDK
11 years ago
Alexander Smorkalov
6da7c50fb5
Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.
11 years ago
Vladimir Bystricky
cc08e00876
Fix notes about cmake files. Fix build warning.
11 years ago
Vladimir Bystricky
e8d2a9752b
Add support Creative Senz3D camera by Intel Perceptual Computing SDK
11 years ago
Alexander Alekhin
cc69d4631a
cmake: detect Direct 3D 11
11 years ago
Anatoly Baksheev
a54ef70c04
minor insignificant corrections
11 years ago
Anatoly Baksheev
0e88733b13
updating Viz cmake (switched to WITH_VTK option)
11 years ago
Alexander Alekhin
0eb2be762a
cmake: allow source_group to preserve file-system tree (for MSVS)
11 years ago
Dirk Van Haerenborgh
8a48802dec
Enable GStreamer 1.x support by default.
...
GStreamer 1.x is universally available, and with 0.10 being deprecated,
there should be no reason to default to 0.10 stil.
11 years ago
Alexander Smorkalov
d39e73365c
Some debug options are removed because they are installed by Cmake automatically.
...
Also forcing -ggdb3 on android leads to debuging issues.
11 years ago
Vladislav Vinogradov
5ac8444c22
fixed CUDA_TOOLKIT_TARGET_DIR for android:
...
use targets/armv7-linux-androideabi is exists
11 years ago
Vladislav Vinogradov
81acc5e73e
added `-Xptxas;-dlcm=ca` and `-target-os-variant=Android` to nvcc flags
11 years ago
Vladislav Vinogradov
26cb0ce1d5
fixed compilation warnings in .cu files
11 years ago
Vladislav Vinogradov
20641b4a0b
fixed CC arch/pts for android (used sm_32)
11 years ago
Tony
69dc840583
mprove Gtk2/3 options in cmake
...
Update to cmake files for to include minimum versions, and tidy up gtk operation.
Files updated:
CMakeLists.txt:
WITH_GTK now uses Gtk3 by default. If not found then Gtk2 is used.
WITH_GTK_2_X forces Gtk2.x use
cmake/OpenCVFindLibsGUI.cmake
Updated selection logic to implement methodology described above.
Implemented warning if Gtk3 not found (and not overridden)
Implemented error if Gtk does not meet minimum required version
cmake/OpenCVMinDepVersions.cmake
Added minimum Gtk version of 2.18.0
11 years ago
Alexander Alekhin
881e837520
ocl/core: added prototype for tests
11 years ago
Roman Donchenko
ef27ac3782
In the example in OpenCVConfig.cmake.in, explicitly add the include paths.
...
After #1801 , the include directories are no longer added automatically,
so we should show the user how to do that.
11 years ago
Roman Donchenko
7f935717cb
In OpenCVConfig.cmake.in, lowercased the commands in the example.
...
This is the preferred style nowadays, and more consistent with the
rest of the code.
11 years ago
Roman Donchenko
4037a4f227
Fixed OpenCV_LIBS when find_package has been used with explicit components.
...
Fixes <http://answers.opencv.org/question/23997/opencv-247-cmake-includes-all-modules-even-if-i/ >.
11 years ago
Vadim Pisarevsky
e2bbe7597b
fixed few compile errors and doc build errors
11 years ago
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
11 years ago
Roman Donchenko
239704f986
Added Visual Studio 2013 detection.
11 years ago
Roman Donchenko
7973594a01
Removed all slashes after ${OpenCV_INSTALL_BINARIES_PREFIX}.
...
If it's followed by a slash and OpenCV_INSTALL_BINARIES_PREFIX is empty,
then the resulting path becomes absolute.
Fixes <http://code.opencv.org/issues/3350 >.
11 years ago
Roman Donchenko
615d6c22d1
Switched OpenCV to a 3-component version number.
...
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
11 years ago
Roman Donchenko
428fb72625
Made the generated file templates' naming more consistent.
...
The general convention is <output file name> + ".in".
11 years ago
Vincent Rabaud
154d119e13
do not use include_directories when calling find_package(OpenCV)
...
This is something that should be left to the user, that's the whole
point of OpenCV_INCLUDE_DIRS.
11 years ago
Vincent Rabaud
8e944cfe70
cleaner fix
11 years ago
Vincent Rabaud
ee7c74ceeb
return when OpenCV is found
11 years ago
Vincent Rabaud
9007a02302
fixes http://code.opencv.org/issues/3367
11 years ago
Philippe FOUBERT
8b0fc04d93
Fix the build of OpenCV with XIMEA on Windows 64 bits:
...
- crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
- the "CMAKE_CL_64" variable is not initialized when using mingw
PR#1039 modified to be able to merge on branch 2.4
11 years ago
Roman Donchenko
104b14e0e0
Fixed CMake warnings/bugs caused by #1670 and #1714
...
include() doesn't create a variable scope, so the settings of
CMAKE_MODULE_PATH and CMAKE_FIND_ROOT_PATH_MODE_* were polluting
everything included after OpenCVDetectCUDA.cmake.
Also, FindCUDA includes FindPackageHandleStandardArgs, which includes
CMakeParseArguments, which causes warnings related to policy CMP0017.
Setting it to NEW seems safe enough.
11 years ago
Roman Donchenko
d07e7897a0
Fixed building with OpenCL, but without the ocl module.
...
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
11 years ago
Vladislav Vinogradov
5e75a22559
fixed find package CUDA for cross-compilation
...
replaced find_host_package with find_package and
set CMAKE_FIND_ROOT_PATH_MODE_LIBRARY to BOTH, because NEVER
doesn't work for CUDA_CUDA_LIBRARY, which is located in
/usr/arm-linux-gnueabihf/lib/libcuda.so for ARM
11 years ago
Vladislav Vinogradov
06c1f9a329
added own version of FindCUDA.cmake
11 years ago
Roman Donchenko
c016c43d25
Fixed Android SDK build - again.
11 years ago