Commit Graph

22 Commits

Author SHA1 Message Date
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
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
Ethan Rublee
2ee4f0de31 Merging back 2.3 cmake changes. 2011-06-24 07:12:34 +00:00
Vadim Pisarevsky
677d2e508f fix for ticket #1153 propagated to trunk 2011-06-21 11:10:45 +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
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
Alexander Shishkov
6aabf72bc5 removed OPENCV_BUILD_SHARED_LIB in favor of BUILD_SHARED_LIBS 2011-05-31 13:17:59 +00:00
Andrey Kamaev
727fbd5376 Android cmake toolchain file is included into OpenCV 2011-05-03 08:13:50 +00:00
Vadim Pisarevsky
4aaa2700f6 do not use Lapack anymore 2011-04-25 21:50:25 +00:00
Andrey Kamaev
68534d70f3 Merged android-experimental branch back to trunk. 2011-04-06 14:31:03 +00:00
Vadim Pisarevsky
9dfb15dbbd some more fixes for the static library configuration 2010-12-05 02:10:59 +00:00
Vadim Pisarevsky
0de9c9fd3c opencv_zlib renamed back to zlib; make static libs work on Windows 2010-12-05 01:19:36 +00:00
Vadim Pisarevsky
8b4cb1d99c make OpenCVConfig.cmake usable in the case of static libs 2010-12-04 23:02:36 +00:00
Vadim Pisarevsky
0cab986ecf applied patches by sigma (ticket #644) 2010-11-29 22:18:28 +00:00
Anatoly Baksheev
b59b0fd7fc added opencv_flann to OpenCVConfig 2010-10-16 17:31:19 +00:00
Andrey Morozov
199ffc632d added flags OpenCV_COMPUTE_CAPABILITIES, which stores the version compute capability from which it is compiled opencv
now use opencv with cuda in your application  in the such way : set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ${OpenCV_COMPUTE_CAPABILITIES})
2010-08-25 12:49:17 +00:00
Anatoly Baksheev
d1fc3e6b5a cv::gpu::CudaStream -> cv::gpu::Stream
some refactoring
added gpu module to compilation
2010-08-10 09:44:50 +00:00
Anatoly Baksheev
131bd5678d removed opencv_gpu from OpenCVConfig.cmake.in 2010-07-16 16:32:39 +00:00
Anatoly Baksheev
7f6fb6ef97 First gpu code draft. Interface might be significantly changed in future.
Simple implementation of StereoBM_GPU.
It is excluded from compilation now.
2010-07-14 15:55:16 +00:00
Jose Luis Blanco
4833f15b22 Tentative fix to using FIND_PACKAGE(OpenCV) from external apps after last atomic bomb commit!
Fixed for OpenCV compiled whereever and NOT "make install"ed. This second case must be checked later, since I'm not sure of the pretended include dirs layout after "make install". 
If all include dirs go to the same target install directory, it should work as is right now.
2010-05-14 09:35:39 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00