Greg Hale
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
Greg Hale
fe3dd762a4
fixed wrong regex
2013-10-19 17:30:32 -04:00
Greg Hale
0c4d484679
added backslash
2013-10-17 14:17:49 -04:00
Greg Hale
61ccd170bd
shortened code to not repeat myself
2013-10-17 14:12:02 -04:00
Greg Hale
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
Greg Hale
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
Greg Hale
f23b51de6f
Added -l prefix to EXTRA_COMPONENTS when generating pkg-config file
2013-10-14 13:36:07 -04:00
Roman Donchenko
df213241cc
Merge pull request #1560 from jet47:cmake-config-cuda-5.5-fix
2013-10-04 18:15:05 +04:00
Vladislav Vinogradov
adc516becc
fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit
2013-10-04 15:14:21 +04:00
Alexander Alekhin
dd9ff587dc
ocl: file-based ProgramCache refactoring
2013-10-03 19:50:14 +04:00
Alexander Alekhin
b00f79ac5f
ocl: move program names into opencl_kernels.hpp
2013-10-03 19:50:14 +04:00
Alexander Alekhin
212ad97100
ocl: dynamic load of OpenCL libraries
...
Support functions from OpenCL 1.1 / OpenCL 1.2
2013-10-02 18:32:33 +04:00
Alexander Smorkalov
308fbeb04b
Make libv4l support optional for testing purposes.
2013-09-30 12:44:59 +04:00
Alexander Alekhin
b4a534a235
cmake: PCH: use DEFINE_SYMBOL target property
2013-09-25 12:27:08 +04:00
Alexander Alekhin
48774a39b4
cmake: fixed incorrect usage of add_definitions() on Linux
2013-09-25 12:27:08 +04:00
Alexander Alekhin
ce557fb7be
Revert "cmake: fixed incorrect usage of add_definitions() on Linux"
...
This reverts commit 286244efed
2013-09-24 15:12:24 +04:00
Alexander Alekhin
286244efed
cmake: fixed incorrect usage of add_definitions() on Linux
2013-09-21 21:12:39 +04:00
Roman Donchenko
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
e5735282da
Added the ability to have samples inside a module.
2013-09-04 18:41:19 +04:00
Alexander Smorkalov
ebe7f00cb4
/apicontainer added to linker flags on WinRT to fix api test issues.
2013-08-28 08:36:57 -07:00
Roman Donchenko
7cefb6f50b
Merge pull request #1335 from alekcac:ios-build-fix
2013-08-23 16:54:48 +04:00
Alexander Shishkov
88712d97c6
fix CMake changes
2013-08-23 16:09:41 +04:00
Roman Donchenko
9bb1a7d34d
Merge pull request #1234 from SpecLad:ios-plist
2013-08-23 15:43:08 +04:00
Alexander Shishkov
396f6bb55f
fixed problems with building iOS version
2013-08-23 13:41:19 +04:00
Roman Donchenko
e1397f6c1f
Merge pull request #1324 from SpecLad:try-compile
2013-08-23 12:06:57 +04:00
Roman Donchenko
10860783ef
Added warnings-as-errors support for MSVC.
2013-08-22 18:25:38 +04:00
Roman Donchenko
a9e9ce859e
Fix errors in usages of try_compile
...
* There's no OPENCV_BINARY_DIR variable;
* No need to append CMakeFiles/CMakeTmp, as CMake does it for you;
* Output variables are unused;
* Wrong usage of CMAKE_FLAGS;
* Small quoting and style issues.
2013-08-22 15:56:35 +04:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
ad7073bc22
Merge pull request #1305 from SpecLad:perf-precomp
2013-08-21 18:34:48 +04:00
Roman Donchenko
868e355e33
Merge pull request #1269 from kdrobnyh:FindIPP-cmake-script
2013-08-21 13:32:27 +04:00
kdrobnyh
ea5dd74af1
Add IPP 8.0 support in FindIPP script
2013-08-21 13:02:18 +04:00
Roman Donchenko
9667a8a1ae
Fix the name of perf tests' precompiled header.
...
(cherry picked from commit aa96d8d053
2013-08-20 14:54:31 +04:00
Alexander Smorkalov
ddbeac503c
WindowsRT availability check reorganized. Build script updated.
2013-08-16 05:22:54 -07:00
kamjagin
7ff07e94a3
Fix for bug Bug #3215 . Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
2013-08-14 13:34:34 +02:00
Miroslav Kobetski
93f05fed35
Fixed elif/elseif error that made highgui-windows fail on mac+cocoa.
2013-08-13 10:34:31 +02:00
Roman Donchenko
dc06d47f1c
Merge pull request #1241 from SpecLad:redundant-precomps
2013-08-12 17:19:53 +04:00
Roman Donchenko
6d7f29a03a
Made it so that a dummy .cpp is actually created when compiling with VC++.
2013-08-08 16:49:14 +04:00
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.
2013-08-06 18:56:36 +04:00
Vadim Pisarevsky
10fde1ca5c
disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled)
2013-08-06 18:31:06 +04:00
Roman Donchenko
2911b12145
Merge pull request #1216 from alekcac:sphinx
2013-08-06 14:31:15 +04:00
Alexander Shishkov
b84b8db277
Removed useless .*
2013-08-06 14:28:07 +04:00
Andrey Pavlenko
af8a03e17f
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
2013-08-05 10:20:25 +04:00
Alexander Shishkov
afd7429cbd
Update OpenCVDetectPython.cmake
...
On my MacOS the output of the sphinx-build binary is the following:
Error: Insufficient arguments.
Sphinx v1.2b1
Usage: /usr/local/bin/sphinx-build [options] sourcedir outdir [filenames...]
...
I have installed sphinx, but without this change HAVE_SPHINX==0 for me, so I can't build docs.
2013-08-03 00:17:40 +04:00
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.
2013-08-02 04:10:56 -07:00
Alexander Smorkalov
6257df1c4b
API restricted on WinRT partially removed from core.
...
Additional CMAKE flag WITH_WINRT added.
2013-07-31 05:43:51 -07:00
Andrey Pavlenko
f7ce70f70a
Merge pull request #1110 from SpecLad:config-cleanup
2013-07-30 17:39:35 +04:00
Roman Donchenko
ee182eb086
Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.
...
Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
2013-07-26 14:35:40 +04:00
Philippe FOUBERT
9c04db554f
Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS
2013-07-20 15:03:30 +02:00
