aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
* cmake: fix python detectionAlexander Alekhin2016-01-201-11/+12
* Merge pull request #5884 from alalek:cmake_varsMaksim Shabunin2016-01-171-3/+16
|\
| * cmake: make ocv_cmake_dump_vars() case insensitiveAlexander Alekhin2016-01-151-3/+5
| * cmake: add DEBUG_PRE/DEBUG_POST commands handlingAlexander Alekhin2016-01-151-0/+11
* | cmake: refactor OpenCL detection, allow custom configurationsAlexander Alekhin2016-01-152-22/+13
|/
* Merge pull request #5969 from alalek:fix_cuda_worldAlexander Alekhin2016-01-151-15/+5
|\
| * build: fix opencv_world with CUDAAlexander Alekhin2016-01-141-15/+5
* | Merge pull request #5893 from dtmoodie:vtkAlexander Alekhin2016-01-141-1/+8
|\ \ | |/ |/|
| * Support for opengl2 in vtk 7.1Dan Moodie2015-12-281-1/+8
* | Merge pull request #5861 from alalek:fix_pkgconfigAlexander Alekhin2016-01-041-4/+7
|\ \ | |/ |/|
| * pkg-config: modules list contains only OpenCV modules (fixes #5852)Alexander Alekhin2015-12-221-4/+7
* | Merge pull request #5860 from Dikay900:patch-1Alexander Alekhin2015-12-241-2/+2
|\ \
| * | [master] Fixed PCH warning during ARM crosscompilationPhilip2015-12-221-2/+2
| |/
* / changed to find TBB library(VS2015)atinfinity2015-12-231-0/+2
|/
* fix MSVS2010 buildsAlexander Alekhin2015-12-181-9/+8
* fix include path for windows packageAlexander Alekhin2015-12-181-1/+0
* Merge pull request #5821 from alalek:build_frameworkVadim Pisarevsky2015-12-184-16/+26
|\
| * update osx and ios build_framework.pyAlexander Alekhin2015-12-174-16/+26
* | Merge pull request #5825 from GregoryMorse:masterVadim Pisarevsky2015-12-181-1/+5
|\ \
| * | merge Win10/VS2015 changesGregory Morse2015-12-171-1/+5
* | | Merge pull request #5810 from mshabunin:hal_interfaceVadim Pisarevsky2015-12-173-2/+4
|\ \ \
| * | | HAL moved back to coreMaksim Shabunin2015-12-173-2/+4
| | |/ | |/|
* / | Properly check for version in find_packageVincent Rabaud2015-12-172-1/+3
|/ /
* | Merge pull request #5784 from alalek:distrib_fixMaksim Shabunin2015-12-155-25/+53
|\ \ | |/ |/|
| * pkg-config: remove $<LINK_ONLY:...> expressionsAlexander Alekhin2015-12-121-1/+7
| * world build: fix modules instantiation orderAlexander Alekhin2015-12-121-2/+14
| * distrib: remove useless static files from shared distribution packageAlexander Alekhin2015-12-123-22/+31
| * fix samples depsAlexander Alekhin2015-12-121-0/+1
* | Merge pull request #5797 from alalek:fix_5018Vadim Pisarevsky2015-12-141-0/+2
|\ \
| * | fixes #5018: fix framework links in opencv.pc (MacOS)Alexander Alekhin2015-12-141-0/+2
| |/
* / workaround: cvconfig.h doesn't work with hal at this momentAlexander Alekhin2015-12-141-0/+1
|/
* Gstreamer 1.0 on windows.Dan2015-12-092-9/+161
* Merge pull request #5757 from alalek:merge-2.4Vadim Pisarevsky2015-12-082-11/+9
|\
| * Merge 2.4 into masterAlexander Alekhin2015-12-082-11/+9
| |\
| | * added suppression for python-script-but-no-python-depIlya Lavrenov2015-11-251-1/+2
| | * Merge pull request #5682 from ilya-lavrenov:lintian-overridesVadim Pisarevsky2015-11-231-0/+82
| | |\
| | | * added lintian overrides for debian packagesIlya Lavrenov2015-11-191-0/+82
| | * | Fix compilation problems with XCode 7.1.1 and cmake 3.3.2Maksim Shabunin2015-11-173-12/+38
| | |/
| | * Fixed cmake and build issues when using Visual Studio 2015Maksim Shabunin2015-10-291-0/+3
| | * Debian packages with legacy C headers added to list of conflicts, relpaces, etc.Alexander Smorkalov2015-10-231-0/+2
| | * export simple libs from OPENCV_LINKER_LIBS (fix #5541)Alexander Alekhin2015-10-192-1/+22
| | * brining over fix in master (#4140) for libz import on 64-bit androidAaron Simmons2015-10-131-1/+2
| | * Debian formatted copyright file added to all debian packages.Alexander Smorkalov2015-10-132-1/+51
| | * Merge pull request #5398 from asmorkalov:as/wrong-name-for-changelog-of-nativ...Alexander Alekhin2015-09-282-1/+15
| | |\
| | | * Fixed wrong-name-for-changelog-of-native-package warning for deb packages.Alexander Smorkalov2015-09-282-1/+15
| | * | Merge pull request #5202 from ilya-lavrenov:gstreamer-v4l2Alexander Alekhin2015-09-241-3/+3
| | |\ \ | | | |/ | | |/|
| | | * repaired GStreamer 0.10 versionIlya Lavrenov2015-08-161-3/+3
| | * | fix for corrent modules dependenciesIlya Lavrenov2015-09-111-0/+2
| | * | Only conflict with packages corresponding to modules that are builtRoman Donchenko2015-08-261-2/+4
| | * | Add missing packages to the Debian conflict listRoman Donchenko2015-08-251-9/+8