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
76b904b022
Replaced our usage of LINK_PRIVATE with that of LINK_INTERFACE_LIBRARIES.
...
The reasons for that are twofold:
1) LINK_PRIVATE is only available since CMake 2.8.7.
2) The way it was used generated a warning because of CMake policy CMP0023:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0023
Using LINK_INTERFACE_LIBRARIES actually causes another warning - this time
because of CMake policy CMP0022:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0022
I set the policy to OLD, because NEW means subtle changes when compiling
with CMake 2.8.12, and I don't want to research that this close to release.
:-)
I also removed the setting of CMP0003, because it's set by
cmake_minimal_version anyway.
11 years ago
Roman Donchenko
f82eb0f79c
Add better OpenMP detection and make an option to enable it.
...
Bug report and inspiration: http://code.opencv.org/issues/3328
11 years ago
Alexander Alekhin
6344da9ac3
ocl: force to use Khronos OpenCL headers
11 years ago
Alexander Alekhin
83b7fbe376
cmake: cleanup OpenCVModules_TARGETS from cache
...
This will allow to disable modules between cmake runs
11 years ago
Alexander Alekhin
09f0e1777e
cmake: fix linker deps for CUDA
11 years ago
Alexander Alekhin
74329ee416
cmake: revert CRT linkage option for MSVS
11 years ago
Alexander Alekhin
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
11 years ago
Tony
81d6842b8e
These changes introduce Gtk3 support into the highgui module.
...
A new option WITH_GTK3 has been added to the cmake configure system to enable compilation under Gtk version 3.The flag HAVE_GTK3 is also introduced to select the new Gtk3 code in the source files. (Gtk2 is disbled when Gtk3 is selected).
window_gtk.cpp has been modified to remove obsolete (and deleted from libgtk 3) and introduce new Gtk3 code in its place when compiled for Gtk3.
To compile for Gtk2, disable WITH_GTK3 in cmake. To build for Gtk3 both WITH_GTK and WITH_GTK3 must be selected.
11 years ago
Alexander Alekhin
212ad97100
ocl: dynamic load of OpenCL libraries
...
Support functions from OpenCL 1.1 / OpenCL 1.2
11 years ago
Alexander Smorkalov
308fbeb04b
Make libv4l support optional for testing purposes.
11 years ago
Adrian Stratulat
f9ea3772b0
Add compile option for enabling NEON
11 years ago
hbristow
530ad447bc
Added fixes to CMakeLists.txt
11 years ago
antonella
5b2d557502
Added plantuml extension
...
Aligned strings in CMakeList
Modified the check on plantuml extension
Some fixes
Moved find_host_program for plantuml script
11 years ago
Roman Donchenko
03926fac20
Fixed finding Git when cross-compiling.
11 years ago
Roman Donchenko
67ae438dae
Refactored NumPy detection.
...
Most importantly, added support for multiple include directores,
but also did some general cleanup.
11 years ago
Roman Donchenko
1a81da012d
Removed old Python detection cruft.
...
None of this should be relevant as of CMake 2.8.7.
11 years ago
Roman Donchenko
6fed0e85c2
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
...
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
11 years ago
Roman Donchenko
880306f6d6
Don't search for Git ourselves - CMake can handle it now.
11 years ago
Roman Donchenko
e45526b9c0
Dropped the CMAKE_VERBOSE option.
...
There's no reason for it to exist, since it just duplicates the
CMAKE_VERBOSE_MAKEFILE variable.
11 years ago
Roman Donchenko
e9a28f66ee
Normalized file endings.
11 years ago
kamjagin
7ff07e94a3
Fix for bug Bug #3215 . Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
11 years ago
Roman Donchenko
a23abef9bd
Removed OpenCVFindPkgConfig.cmake, since it's bundled with CMake now.
...
In fact, I don't think we actually use it... but I kept the include,
just in case.
11 years ago
Roman Donchenko
168e2a4ccb
Removed CMake version checks that we don't need anymore.
11 years ago
Roman Donchenko
a87756e9b3
Bumped minimal CMake version to 2.8.7.
11 years ago
Roman Donchenko
a495bbb967
Added a new file for recording minimal dependency versions.
11 years ago
Roman Donchenko
5dd598fc6d
Fix building the iOS framework after I dropped the VERSION macro.
...
This version uses CMake to generate Info.plist, which should be more
reliable than the old approach.
11 years ago
Alexander Smorkalov
63786c389f
Warning and review notes fixes.
...
WITH_WINRT -> ENABLE_WINRT_MODE;
Some temporary char* replaced with Ptr<char>;
Build fix for regular WIN32;
Windows Platform SDK and MSVC search added to cmake;
Warinig fixes.
11 years ago
Alexander Smorkalov
6257df1c4b
API restricted on WinRT partially removed from core.
...
Additional CMAKE flag WITH_WINRT added.
11 years ago
Roman Donchenko
abe4219256
Drop the legacy CMake options.
...
3.0 seems like an appropriate time to do that.
12 years ago
Roman Donchenko
4f9554eead
Removed a few more unused configuration macros.
...
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.
Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
12 years ago
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
12 years ago
hbristow
804d0924c9
cmake now attempts to generate and compile a simple mex file at configure time and reports the working status of the generator and compiler, rather than just naively saying Matlab exists
12 years ago
Hilton Bristow
5d1944bace
Added jinja framework for templates and base templates for functions and docs
12 years ago
Hilton Bristow
ac748747d4
FindMatlab.cmake in cmake find_package format
12 years ago
Hilton Bristow
ded45b4d1a
Added basic ability to find Matlab installations. Added test cpp file under modules/matlab/test to test mex compiler within cmake
12 years ago
Roman Donchenko
a954d3630f
Add support for adding custom OpenCV modules.
12 years ago
Andrey Pavlenko
e28f6fae49
fixing #3027 (searching JNI even if no ant), fixing java tests status message (ON/OFF)
12 years ago
Alexander Smorkalov
20fef00a77
android -> plarforms/android
12 years ago
Dominik Rose
66c9029fd5
libdc1394 - removed validation for msvc compiler in CMakeLists.txt
12 years ago
Dominik Rose
86ec9b79fd
libd1394 2.x support for mingw on windows added
12 years ago
Dominik Rose
9247ad634f
libd1394 2.x support for mingw on windows added
12 years ago
Andrey Kamaev
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
12 years ago
Andrey Kamaev
f856f78ac0
Update CMake scripts to recognize Qt 5.0
12 years ago
Andrey Kamaev
b2ba8b9969
Drop old python interface
12 years ago
Andrey Kamaev
2c57445ffe
Improve CMake checks for the OpenGL availability
...
Issue #2868
12 years ago
Alexander Smorkalov
a2561ee0cd
Code review notes fixed.
12 years ago
Alexander Smorkalov
4703f4552a
Experimental MS Media Foundation API support added
12 years ago
Alexander Smorkalov
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
12 years ago
Alexander Smorkalov
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
12 years ago