27ae6eb1f4
Merge pull request #1720 from SpecLad:cmp0017
2013-10-30 17:46:33 +04:00
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.
2013-10-30 16:21:50 +04:00
d07e7897a0
Fixed building with OpenCL, but without the ocl module.
...
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
2013-10-30 14:07:34 +04:00
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
2013-10-30 12:10:35 +04:00
957c85e9c4
Merge pull request #1670 from jet47:cuda-cmake-fix
2013-10-29 13:24:14 +04:00
06c1f9a329
added own version of FindCUDA.cmake
2013-10-28 10:09:16 +04:00
c1223f8dac
Merge pull request #1697 from SpecLad:sdk-redux
2013-10-25 20:32:04 +04:00
90f8906e1e
Merge pull request #1690 from SpecLad:cmake-2.8.12
2013-10-25 19:24:58 +04:00
c016c43d25
Fixed Android SDK build - again.
2013-10-25 19:12:32 +04:00
7a8f9fe746
cmake: fix android installation for different NDK ABIs
2013-10-25 17:17:00 +04:00
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.
2013-10-25 14:19:02 +04:00
4b17d073c0
cmake: fix linker dependencies for opencv_java
...
Linker dependencies to all OpenCV modules are invalid.
We should not include other bindings in this list (like "opencv_python").
2013-10-24 19:04:59 +04:00
e5947f581a
fix CUDA 5.5 support (npp, arm cross compilation) in CMake scripts:
...
The patch was submitted to CMake and might be available
in the next CMake release.
But until we have the fix in CMake we should add workaround in our scripts.
2013-10-24 18:17:36 +04:00
f0bc253d0e
Merge pull request #1667 from SpecLad:detect-openmp
2013-10-24 15:00:27 +04:00
119cdc57e9
Merge pull request #1623 from ImAlsoGreg:2.4-pkgconfig-dash-l
2013-10-24 14:18:12 +04:00
d571b28eaa
cmake: fix bug with installation into OPENCV_LIB_INSTALL_PATH directory
2013-10-23 20:28:22 +04:00
f82eb0f79c
Add better OpenMP detection and make an option to enable it.
...
Bug report and inspiration: http://code.opencv.org/issues/3328
2013-10-22 18:47:37 +04:00
387587f4f0
regex doesnt need to match full length of input, so only trying to match the leading -[lL]
2013-10-21 09:27:04 -04:00
a54d36bde8
Merge pull request #1646 from alalek:ocl_fix_msvc11
2013-10-21 16:53:24 +04:00
bfd8acbbc3
Merge pull request #1556 from jet47:fix-bug-3296
2013-10-21 16:28:00 +04:00
fe3dd762a4
fixed wrong regex
2013-10-19 17:30:32 -04:00
cfc3b9abbb
ocl: workaround for msvc11 bug
...
"#error" requires DOS line endings (or fails with fatal error C1004: unexpected end-of-file found)
See: http://connect.microsoft.com/VisualStudio/feedback/details/794991/c-error-directive-and-unix-line-endings-leads-to-an-unexpected-end-of-file
So replace them to #pragma message.
2013-10-18 20:52:36 +04:00
d50f0d2ed2
Merge pull request #1587 from alalek:opencl_khronos_headers
2013-10-18 18:41:13 +04:00
6344da9ac3
ocl: force to use Khronos OpenCL headers
2013-10-18 15:47:11 +04:00
83b7fbe376
cmake: cleanup OpenCVModules_TARGETS from cache
...
This will allow to disable modules between cmake runs
2013-10-17 23:43:33 +04:00
0c4d484679
added backslash
2013-10-17 14:17:49 -04:00
61ccd170bd
shortened code to not repeat myself
2013-10-17 14:12:02 -04:00
5bd5993663
Only append -l to lib entries with no path and no -l or -L of their own
2013-10-17 14:05:06 -04:00
9941d3f71a
cmake: restore find_package() for build directory
2013-10-15 23:05:40 +04:00
70df365c87
changed foreach variable to match naming conventions and dropped intermediate variable, appending directly to the LIB_COMPONENTS list
2013-10-15 14:54:58 -04:00
f23b51de6f
Added -l prefix to EXTRA_COMPONENTS when generating pkg-config file
2013-10-14 13:36:07 -04:00
3b1c53fa8d
Merge pull request #1551 from alalek:cmake_install_win
2013-10-10 18:20:35 +04:00
d26f62569d
ocl: fix compilation warnings, update openCLExecuteKernelInterop
2013-10-10 00:15:02 +04:00
fbe7448250
cmake: export OpenCVModules for unix 'install', move macros desclarations
2013-10-09 18:29:03 +04:00
4adede4246
cmake: python module updates
2013-10-09 17:49:11 +04:00
47dd44e490
cmake: OpenCVConfig.cmake: fix message
2013-10-09 17:49:11 +04:00
034a77c26d
cmake: workaround for dependencies resolver (bypass non-module deps w/o check)
2013-10-09 17:49:10 +04:00
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
2013-10-09 17:49:10 +04:00
df213241cc
Merge pull request #1560 from jet47:cmake-config-cuda-5.5-fix
2013-10-04 18:15:05 +04:00
adc516becc
fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit
2013-10-04 15:14:21 +04:00
dd9ff587dc
ocl: file-based ProgramCache refactoring
2013-10-03 19:50:14 +04:00
b00f79ac5f
ocl: move program names into opencl_kernels.hpp
2013-10-03 19:50:14 +04:00
4e4d2da0b9
fix #3296 : Unsupported gpu architecture 'compute_21'
2013-10-03 10:21:00 +04:00
212ad97100
ocl: dynamic load of OpenCL libraries
...
Support functions from OpenCL 1.1 / OpenCL 1.2
2013-10-02 18:32:33 +04:00
308fbeb04b
Make libv4l support optional for testing purposes.
2013-09-30 12:44:59 +04:00
b4a534a235
cmake: PCH: use DEFINE_SYMBOL target property
2013-09-25 12:27:08 +04:00
48774a39b4
cmake: fixed incorrect usage of add_definitions() on Linux
2013-09-25 12:27:08 +04:00
ce557fb7be
Revert "cmake: fixed incorrect usage of add_definitions() on Linux"
...
This reverts commit 286244efed
2013-09-24 15:12:24 +04:00
286244efed
cmake: fixed incorrect usage of add_definitions() on Linux
2013-09-21 21:12:39 +04:00
671e5e39b1
Dropped the HAVE_DC1394_095 configuration macro.
...
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.
Note that 1.0 doesn't have the do_extra_buffering parameter.
2013-09-13 17:25:21 +04:00
Roman Donchenko
Vladislav Vinogradov
Alexander Alekhin
Greg Hale
Andrey Pavlenko
Alexander Smorkalov