Commit Graph

254 Commits

Author SHA1 Message Date
Andrey Kamaev
691d392312 Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005. 2012-02-16 20:29:35 +00:00
Leonid Beynenson
3ef5bfa185 Applied the patch, received from akamaev. Also made some changes in CMake files to fix Android camera issue. 2012-02-09 15:02:21 +00:00
Andrey Kamaev
49933c798f Fixed build for desktop 2012-02-06 11:48:15 +00:00
Andrey Kamaev
23af203e00 Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts 2012-02-06 11:30:59 +00:00
Andrey Kamaev
984eb99428 Global CMake reorganization:
[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Vadim Pisarevsky
fd084a0a7e fixed bug #1415 2012-01-27 20:36:19 +00:00
Vadim Pisarevsky
b33c9b10bc fixed bug #1566 2012-01-27 20:28:59 +00:00
Andrey Kamaev
13f4e70e95 Updating opencv module definition in cmake 2012-01-24 16:55:47 +00:00
Andrey Kamaev
6f99447fbf Fixed compiler flags caching in cmake 2012-01-24 11:46:11 +00:00
Andrey Kamaev
8cab65c173 Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options. 2012-01-03 13:48:12 +00:00
Andrey Morozov
209aaac95c fixed parallel build under Windows 2011-12-19 13:20:34 +00:00
Andrey Morozov
ca5d28d127 added experimental feature for parallel build solution under Windows 2011-12-16 07:14:55 +00:00
Vladislav Vinogradov
3afc97e67e fixed new OpenGL functionality under Qt 2011-12-12 12:52:06 +00:00
Vladislav Vinogradov
2a4fb155e1 added OpenGL support to Gtk realization of highgui 2011-11-28 08:23:26 +00:00
Vladislav Vinogradov
35e69a1ee3 fixed build with Qt 2011-11-27 10:13:08 +00:00
Vladislav Vinogradov
c2783af781 added OpenGL support to highgui under WIN32 2011-11-21 11:58:52 +00:00
Andrey Kamaev
d45f561ef5 Small improvements in cmake status report 2011-11-18 08:14:42 +00:00
Andrey Kamaev
a13dfc7f70 Fixed perf target 2011-11-18 07:57:14 +00:00
Andrey Kamaev
3bdb53e484 Android cmake toolchain is reworked for NDK r7; added experimental Android x86 support. 2011-11-16 14:32:10 +00:00
Leonid Beynenson
59d89c7a7a Added possibility to configure TBB behavior in Perf tests --- now we can set the number of TBB threads in the perf tests either as console parameter perf_tbb_nthreads or
in a test itself using the method declare.tbb_threads(n).
2011-10-31 16:22:05 +00:00
Vladislav Vinogradov
40ee754e28 added WITH_CUFFT and WITH_CUBLAS flags to cmake scripts
fixed gpu module error reporting
added asynchronous version of some functions
2011-10-19 09:53:22 +00:00
Alexander Shishkov
bb130d14bd Changed type of OPENCV_BUILD_3RDPARTY_LIBS variable to the INTERNAL on WIndows
(see comments for #1030 ticket https://code.ros.org/trac/opencv/ticket/1030)
2011-10-03 16:59:24 +00:00
Leonid Beynenson
fcaa587b67 CMake scripts changed a bit: added more accurate variant of the Threading Framework support (it is a lightweight analogue of TBB for ARM-s). 2011-09-27 16:25:13 +00:00
Andrey Kamaev
fb2c288627 Fixed some cmake 2.6 compatibility issues. 2011-09-18 15:30:36 +00:00
Andrey Kamaev
1917d8b006 Fixed perf target on Windows. 2011-09-08 06:27:46 +00:00
Andrey Kamaev
5cce038958 Performance testing branch is merged back into trunk 2011-09-06 15:30:28 +00:00
Andrey Kamaev
1f0035d2af Fixed native_camera library build for Androids having version in x.x format 2011-09-01 14:39:26 +00:00
Artem Myagkov
abdd342d50 modifed minimum required cmake version for ios 2011-08-31 18:42:44 +00:00
Artem Myagkov
3a3bc18381 modified capturing building ligic for iOS 2011-08-24 10:53:57 +00:00
Artem Myagkov
8c6782300a modified highgui and ts modules and cmakelists for ios cross-compiling, added ios toolchains, added ios build tutorial 2011-08-23 11:19:58 +00:00
Vadim Pisarevsky
3b7b833a4e merged latest fixes from 2.3 branch; since 2.3.1 is out, the version in trunk is bumped to 2.3.2 2011-08-17 20:12:11 +00:00
Vadim Pisarevsky
d752c2b674 disabled fast-math by default. 2011-08-17 09:05:05 +00:00
Vadim Pisarevsky
bd0d8429ee added support for Ximea cameras (patch by Marian Zajko), fixed GCC warnings in MOG2 background subtractor. 2011-08-11 17:59:30 +00:00
Maria Dimashova
04e4eaabaf updated openni finding by cmake (#1190, #1252); updated doc on kinect 2011-08-10 14:58:55 +00:00
Vadim Pisarevsky
f9ef92d45a multilib support added (ticket #363) 2011-08-10 12:49:52 +00:00
Maria Dimashova
7f1995f19a fixed cmake status of openni 2011-08-10 11:59:37 +00:00
Andrey Kamaev
a0590273e9 Java API: fixed problems in video and ml modules; generated test stubs for all exported functions (now we have 1701 tests). 2011-08-05 08:39:28 +00:00
Andrey Kamaev
99b8e2db14 Java API: added tests for FAST feature detector 2011-08-02 14:32:43 +00:00
Vadim Pisarevsky
7c54ebfe1b corrected OpenEXR status in CMakeLists.txt 2011-07-27 20:53:19 +00:00
Andrey Kamaev
8ab16f66a8 Fixing native camera for Android 2011-07-25 11:16:32 +00:00
Andrey Kamaev
a17b693aa9 Fixed build of Android samples and tests 2011-07-24 20:44:20 +00:00
Andrey Kamaev
712ea05058 Refactored CMakeLists.txt for java module 2011-07-22 13:10:50 +00:00
Andrey Kamaev
078eae7154 Added cmake dependency on version.hpp. From now cmake will automatically rerun if version.hpp file is changed. 2011-07-21 21:44:48 +00:00
Andrey Kamaev
f503b029a7 Allowed to build html documentation without pdf documentation. 2011-07-19 20:27:58 +00:00
Andrey Kamaev
066039fd15 Improved ANDROID_SDK_TARGET detection; improved NDK detection in android.toolchain.cmake 2011-07-13 13:06:14 +00:00
Andrey Kamaev
6c668dd704 Fixed Android SDK searching 2011-07-13 09:17:41 +00:00
Andrey Kamaev
355f6d0a73 Fixed Android SDK searching 2011-07-13 09:10:21 +00:00
Andrey Kamaev
6623fe3b08 Added option INSTALL_ANDROID_EXAMPLES (default off); Added option for choosing SDK platform for Android tests and samples. 2011-07-12 15:59:31 +00:00
Vadim Pisarevsky
569b1ad582 embeded cv Python module into cv2. 2011-07-12 12:56:03 +00:00
Andrey Kamaev
2dd965b7f5 minor cmake corrections 2011-07-12 07:40:29 +00:00
Alexander Shishkov
b50428bf65 removed -static-libstdc++ flag for compatibility with old MinGW version 2011-07-08 07:10:37 +00:00
Alexander Shishkov
3a8a729a52 removed CPack
added target package_source (tar or zip)
2011-07-08 07:08:59 +00:00
Vadim Pisarevsky
af00cd5b75 Disabled -ffast-math in the case of GCC 4.6.x (ticket #1201) 2011-07-07 22:35:34 +00:00
Vadim Pisarevsky
db0dcaffeb fixed #1204 2011-07-07 22:10:13 +00:00
Andrey Kamaev
ff8fe39e23 removed duplicated compiler flags assignment 2011-07-05 06:42:56 +00:00
Vadim Pisarevsky
b33224f0b6 merged the latest fixes in 2.3 to trunk 2011-07-04 16:18:12 +00:00
Andrey Kamaev
730622178b Turned off android camera and java wrappers for low Android API levels (android-8 is required for these components) 2011-07-04 11:41:39 +00:00
Andrey Kamaev
d96f533784 Instroduced separate option for Android examples - BUILD_ANDROID_EXAMPLES 2011-07-04 08:18:02 +00:00
Andrey Kamaev
1c96aac52e Fixed several cross-compiling issues. Fixed cmake status report. 2011-07-02 15:12:07 +00:00
Vadim Pisarevsky
f8e1e88ce2 we do not need strmiids.lib anymore 2011-07-01 14:03:03 +00:00
Andrey Kamaev
837b733a0a Modified cmake status report 2011-07-01 12:23:03 +00:00
Vadim Pisarevsky
3cbe53c5d2 got back to the old DLL naming scheme (opencv_core230_vs2001_64d.dll => opencv_core230[d].dll) 2011-07-01 12:14:51 +00:00
Ethan Rublee
08d3dcc709 minor edits to cmake. 2011-07-01 00:57:00 +00:00
Ethan Rublee
38b5d4ecc9 Adding namemangling to the opencv.pc file. 2011-07-01 00:14:09 +00:00
Andrey Kamaev
529f103456 Merged name suffixes for windows (from 2.3 branch) 2011-06-30 19:45:52 +00:00
Andrey Kamaev
092699783a Added cmake script to build Android samples 2011-06-30 13:37:56 +00:00
Andrey Kamaev
aa47802e88 Modified version section to read version number from version.hpp;
Added search for ant and Android SDK (needed for Android tests and samples).
2011-06-30 07:24:35 +00:00
Andrey Kamaev
96d29621b7 Fixes for path mangling feature 2011-06-29 06:27:08 +00:00
Ethan Rublee
773654e11a More work on the mangling of install paths. 2011-06-28 19:24:31 +00:00
Ethan Rublee
6259c9ac6a First pass at name mangling based on version number, to support
side by side installs of OpenCV2.3.0 OpenCV2.3.1 OpenCV2.4.x, etc...
2011-06-28 16:02:09 +00:00
Andrey Kamaev
f60bdb2473 Fixed Android.mk file generation 2011-06-28 08:48:23 +00:00
Andrey Kamaev
822b0bfe22 Minor bugfix 2011-06-28 07:20:30 +00:00
Andrey Kamaev
591cb1b3cf Fixed compiler options in Android build (Windows) 2011-06-28 05:51:41 +00:00
Andrey Kamaev
ba7ee71c20 Numerous small fixes in CMakeLists.txt 2011-06-28 05:18:53 +00:00
Andrey Kamaev
cf28846bce Fixed OpenCVConfig.cmake generation for windows 2011-06-27 16:55:10 +00:00
Andrey Kamaev
31fcd406e1 Eliminated cmake warning for case when python is not found. 2011-06-27 16:21:22 +00:00
Andrey Kamaev
b43ae03328 * Install path share/opencv is renamed to share/OpenCV.
* Fixed zlib search.
* Fixed compiler/linker flags caching bug.
* Fixed OpenCVConfig.cmake generation (currently tested only on Unix).
2011-06-27 13:59:03 +00:00
Andrey Kamaev
f0227edd2c Minor python search improvements 2011-06-27 08:24:10 +00:00
Vadim Pisarevsky
d195871904 propagated fix for ticket #1168 to trunk 2011-06-25 09:39:41 +00:00
Andrey Kamaev
c1940b4ec7 Modified install layout for Android 2011-06-24 15:40:27 +00:00
Andrey Kamaev
69b79f89c1 Updated build scripts for better Java module support 2011-06-24 07:48:04 +00:00
Andrey Kamaev
e60b8dfba0 Fixed numpy search on Windows x64 2011-06-23 09:16:55 +00:00
Andrey Kamaev
9600ebadf2 Main CMakeLists.txt merged with 2.3 branch 2011-06-22 11:53:15 +00:00
Andrey Kamaev
76bc9f8c20 Removed SWIG from Android toolchain; always search for python; find_program/find_package cmake functions wrapped for case of cross-compiling. 2011-06-22 10:38:57 +00:00
Andrey Kamaev
ea58cdc71d (trunk) Do not use prebuilt Android camera libs for armeabi hardware target 2011-06-20 15:57:42 +00:00
Andrey Kamaev
9c71134caf Added generation of OpenCV.mk file for Android development with ndk-build tool 2011-06-20 15:35:05 +00:00
Vadim Pisarevsky
151bfb2ae2 use "-O2 -DNDEBUG" in release by default in the case of MinGW 2011-06-18 13:09:57 +00:00
Alexander Shishkov
d198e39d35 set default compiler flags to "-O2" in the case of MinGW 2011-06-17 15:44:05 +00:00
Andrey Morozov
840baa2205 improved build of installer package for windows 2011-06-17 15:02:10 +00:00
Andrey Kamaev
e722cb96e7 Added cmake file to compile Android native camera wrapper if Android source tree is available 2011-06-17 13:52:55 +00:00
Alexander Shishkov
0ec452c152 turned off Python support for Windows in Debug mode 2011-06-17 13:12:21 +00:00
Alexander Shishkov
78dcb42822 fixed compilation on Linux in static case 2011-06-17 12:53:57 +00:00
Andrey Kamaev
6e8b4e646a Fixed Android install target 2011-06-17 11:10:35 +00:00
Andrey Kamaev
206aa50f86 Added Android native camera module 2011-06-16 18:00:41 +00:00
Vadim Pisarevsky
35d5a671a2 little fix: "and" => "AND" 2011-06-16 10:20:26 +00:00
Vadim Pisarevsky
17b18de531 added missing evcode.h; made videoinput optional (ticket #1142) 2011-06-16 09:51:34 +00:00
Vadim Pisarevsky
412e7a835f videoInput is now integrated into highgui and built from sources 2011-06-15 22:59:41 +00:00
Vadim Pisarevsky
4b4e30f6c1 fixed gcc dwarf2 check 2011-06-15 17:34:43 +00:00
Alexander Shishkov
13a9129d20 turned off WITH_VIDEOINPUT for mingw with dwarf2 2011-06-15 15:59:50 +00:00
Anatoly Baksheev
117ff43cc3 default cuda target flags changed
cuda support is on by default
2011-06-15 08:05:34 +00:00