mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-26 02:28:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,731 Commits 6 Branches 127 Tags 3 GiB
dfb9832a25
Commit Graph

147 Commits

Author SHA1 Message Date
Dmitry Kurtaev
16368a275b cmake: add Halide support (#8794) 2017-06-21 14:33:47 +03:00
Alexander Alekhin
3e3e2dd512 android: make optional "cpufeatures", build fixes for NDK r15 2017-06-21 13:34:19 +03:00
Alexander Alekhin
db35e13b46 build: added VERSIONINFO resource 2017-06-20 15:45:21 +03:00
Alexander Alekhin
f3eff00bf7 cmake: update handling of IPPICV/IPPIW 2017-04-26 00:15:54 +03:00
Maksim Shabunin
e72d353b45 Download cache 2017-03-24 16:19:56 +03:00
Alexander Alekhin
69df0eee77 cmake: fix try_compile() with --coverage flags 2017-03-23 18:15:24 +03:00
Alexander Alekhin
e16227b53c cmake: support multiple CPU targets 2017-02-13 19:52:59 +03:00
Alexander Alekhin
36b34465a4 cmake: include contrib modules into opencv_world 2017-01-23 18:45:53 +03:00
Dal Rupnik
e71ff78f7f Merge pull request #8009 from Legoless:master 
CMake: Building Dynamic Framework on iOS (#8009)

* Updated python script with dynamic parameter

Updated python script to build static library by default

Updated python script to include bitcode flag

Added bitcode flag to c flags

Fixed directories and targets with static

Bitcode parameter fixed

Fixed script for static library

Fixed parameters in build function

Updated cmake common toolchain

Added changes to OpenCV Utils

Updates to cmake

Added cache internal

Updates to common toolchain

Fixed path in framework destination and added UIKit dependency

Dynamic plist for framework

Lib version removed hardcoded value

Removed trailing whitespace in toolchain

* Removed trailing whitespace

* Fixed typo in comment

* Renamed bitcode variable to bitcodedisabled

* Fixed target device family
 2017-01-20 19:16:01 +03:00
Alexander Alekhin
35308bc45f cmake: fix CMake error 
"install DIRECTORY does not allow "COMPONENT" after PATTERN or REGEX."
 2016-12-19 14:58:56 +03:00
Alexander Alekhin
0e4dde1781 Merge pull request #7872 from alalek:merge-2.4 2016-12-16 16:03:14 +02:00
Alexander Alekhin
540ece74a5 cmake: support ICC warnings 2016-12-15 15:57:27 +03:00
Alexander Alekhin
3ae1990727 Merge pull request #7769 from alalek:cmake_ffmpeg_cleanup 2016-12-01 20:24:05 +00:00
Vadim Pisarevsky
5e75503fc2 Merge pull request #7750 from alalek:ts_find_or_skip 2016-12-01 18:10:18 +00:00
Alexander Alekhin
39ff8a0d26 cmake: cleanup ffmpeg detection 2016-12-01 19:33:27 +03:00
mshabunin
695c518384 Updated TBB search script and code checks 2016-12-01 16:58:38 +03:00
Alexander Alekhin
71b2409df0 ts: added findDataFile() utility function and SkipTestException 2016-11-29 23:17:39 +03:00
Alexander Alekhin
6cfe4a85f7 cmake: fix ocv_check_compiler_flag 2016-10-08 02:19:43 +03:00
Alexander Alekhin
b640e72877 cmake: update PCH 
1) fix include directories
2) don't use PCH for source file with custom COMPILE_FLAGS
 2016-10-04 19:41:28 +03:00
Alexander Alekhin
21d9412c93 cmake: fix for GCC 6.x 2016-10-03 19:39:04 +03:00
Alexander Alekhin
db6d94a7b0 cmake: minimize MSVS projects layout 
Also put "object" targets to off by default (they doesn't work well)
 2016-08-26 13:40:16 +03:00
Alexander Alekhin
5f269d08b4 bigdata: add test, resolve split/merge issue 2016-07-08 18:05:53 +03:00
Alexander Alekhin
c5a8619493 cmake: fix install path 
CMake doesn't work with empty paths ("") or paths which contains "./"
 2016-06-28 13:29:00 +03:00
Alexander Alekhin
f57e3ce5f3 cmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX 
CPack can't work with absolute paths.
 2016-06-22 16:38:54 +03:00
Alexander Alekhin
c6c651212c cmake: refactoring of OpenCVConfig 
- removed OpenCV_LIB_DIR* vars (they are broken and not required anymore)
- OpenCVConfig.cmake doesn't contain ANDROID/CUDA code if there is no such support
- removed OpenCV2_INCLUDE_DIRS_CONFIGCMAKE, merged into OpenCV_INCLUDE_DIRS_CONFIGCMAKE
- fix hard-coded relative paths for OpenCV_INSTALL_PATH
- removed OpenCV_TBB_ARCH
- switch OpenCVConfig.cmake into 2-level mode for Android SDK
 2016-06-20 15:15:21 +03:00
Alexander Alekhin
f4ebc504d1 cmake: refactor HAL attaching process 2016-06-15 17:34:30 +03:00
Alexander Alekhin
9393a0c5bb cmake: don't use -isystem for opencv_contrib paths 2016-04-18 12:48:14 +03:00
Alexander Alekhin
8f37a3a37c cmake: make ocv_cmake_dump_vars() case insensitive 2016-01-15 14:38:25 +03:00
Alexander Alekhin
9cd6731894 cmake: add DEBUG_PRE/DEBUG_POST commands handling 
Useful for debug purposes:
    cmake -DDEBUG_POST="ocv_cmake_dump_vars(CUDA)" .
    cmake -DCMAKE_PRE="ocv_cmake_dump_vars(\"OPENCL|opencl\")" .
 2016-01-15 14:36:03 +03:00
Alexander Alekhin
c8ff7a4867 build: fix opencv_world with CUDA 2016-01-14 17:23:55 +03:00
Alexander Alekhin
24dbb43c09 pkg-config: modules list contains only OpenCV modules (fixes #5852) 2015-12-22 17:28:38 +03:00
Alexander Alekhin
be23846c4e update osx and ios build_framework.py 2015-12-17 16:17:31 +03:00
Alexander Alekhin
2bfad68812 pkg-config: remove $<LINK_ONLY:...> expressions 2015-12-12 15:23:31 +03:00
Alexander Alekhin
d86d8ed909 Merge 2.4 into master 
PR #2968: cce2d99 8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher

The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.

PR #3236: 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.

PR #3190
fix blobdetector

PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.

PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h

PR #3792: afdf319
Add -L for CUDA libs path to pkg-config

Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.

PR #3893: 122b9f8
Turn ocv_convert_to_lib_name into a function

PR #5490: ec5244a
fixed memory leak in findHomography tests

PR #5491: 0d5b739
delete video readers

PR #5574

PR #5202
 2015-12-08 10:24:54 +03:00
Alexander Alekhin
937a096bf1 export simple libs from OPENCV_LINKER_LIBS (fix #5541) 2015-10-19 13:49:41 +03:00
Vladislav Vinogradov
02c48ab7d6 add CTest support to build tree 2015-10-13 17:34:08 +03:00
Ashley Stacey
d8d78b4a98 Fix pdb file generation on Windows for CMake versions after 3.1.0. 
Pdb file support was changed in CMake 2.8.12, support was added in CMake 3.1.0 to work around the problems created by the change introduced in CMake 2.8.12.
 2015-08-17 10:28:22 +10:00
Alexander Alekhin
56ad207d37 update ffmpeg wrapper binaries 
Scripts are updated for Linux-based (Ubuntu 14.04) mingw cross-compilation (full stack of scripts provided)
Part of these scripts may work under Windows installation of MinGW, but it is not supported.

FFMPEG update: 2.7.1
Added OpenH264 Cisco binaries support for H264 encoding: v1.4.0
 2015-07-03 19:13:15 +03:00
Maksim Shabunin
11ca4e61a7 Merge pull request #4134 from alalek:fix_get_target_property 2015-06-18 08:36:55 +00:00
Alexander Alekhin
f11ed4b91d fix "non target" warning for "world" build 2015-06-17 20:07:56 +03:00
Alexander Alekhin
1ce0ef9d41 fix build without IPP (and empty 3rdparty) 2015-06-17 17:24:35 +03:00
Maksim Shabunin
3863dc5b2b Updated pkg-config generation, added sample makefile 2015-05-22 16:09:07 +03:00
Maksim Shabunin
f803c2a7bb Generators: updated the library gathering loop 2015-04-08 14:15:20 +03:00
Maksim Shabunin
979721c979 Fix generating of android.mk 2015-04-06 16:12:00 +03:00
Roman Donchenko
6e121b2e29 Use imported targets for linking to CUDA 
This retains the desirable quality of not including paths to CUDA libraries
from the build system into the config files, and has two major advantages:

* It removes the need to use link_directories, which doesn't guarantee that
  the libraries from the supplied directory will be used (there may be
  libraries with the same names earlier in the search path).

* It removes the need to put -L entries into OPENCV_LINKER_LIBS. This variable
  is used with target_link_libraries, where such entries are treated as linker
  flags, so doing this is unportable. I remove the support for -L entries
  from OpenCVGenPkgconfig.cmake, as well, to discourage adding them in the
  future.
 2015-03-31 13:46:28 +03:00
Roman Donchenko
122b9f8e17 Turn ocv_convert_to_lib_name into a function 2015-03-30 14:58:37 +03:00
Maksim Shabunin
eb30799aed Disable object libraries building for cmake 2.8.7 and earlier 2015-02-25 15:00:44 +03:00
Maksim Shabunin
2085251df2 Exclude object libraries from visual studio solution build 2015-02-18 14:16:54 +03:00
Maksim Shabunin
a5a510da4b Support for compound modules, support for contrib_world 2015-02-10 18:30:05 +03:00
Vladislav Vinogradov
0376a8643e fix CMake CMP0054 warning: 
ported from c105b72945
 2015-01-15 18:40:33 +03:00
Andrey Kamaev
c105b72945 Assorted fixes: 
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
 2014-12-25 12:41:16 +03:00
Maksim Shabunin
571ebb2373 Fixing iOS clang warnings, part 3 2014-10-17 18:15:21 +04:00
Maksim Shabunin
ef3d02214b Fixing iOS clang warnings, part 2 2014-10-17 18:14:54 +04:00
Maksim Shabunin
630eddf25a Extracted repeated cmake instruction block 2014-10-17 18:14:53 +04:00
Vladislav Vinogradov
f5d9359da8 use directory-based include_directories command if we build with CUDA 2014-08-13 18:08:08 +04:00
Vladislav Vinogradov
0825120f6a move CUDA compilation step from ocv_glob_module_sources to ocv_add_library 2014-08-13 18:07:31 +04:00
Alexander Alekhin
55188fe991 world fix 2014-08-05 20:12:35 +04:00
vbystricky
d58f736935 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
Roman Donchenko
72aabb8a84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVGenAndroidMK.cmake
	cmake/templates/OpenCV.mk.in
	doc/tutorials/viz/creating_widgets/creating_widgets.rst
	doc/tutorials/viz/launching_viz/launching_viz.rst
	doc/tutorials/viz/table_of_content_viz/images/image_effects.png
	doc/tutorials/viz/transformations/transformations.rst
	doc/tutorials/viz/widget_pose/widget_pose.rst
	modules/core/include/opencv2/core/affine.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/cuda/canny.cu
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_color.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_gpumat.cpp
	modules/gpu/test/test_hough.cpp
	modules/nonfree/CMakeLists.txt
	modules/nonfree/include/opencv2/nonfree/gpu.hpp
	modules/nonfree/perf/perf_gpu.cpp
	modules/nonfree/src/cuda/surf.cu
	modules/nonfree/src/precomp.hpp
	modules/nonfree/src/surf_gpu.cpp
	modules/nonfree/test/test_gpu.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/stitching/CMakeLists.txt
	modules/stitching/include/opencv2/stitching/detail/matchers.hpp
	modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
	modules/stitching/include/opencv2/stitching/detail/warpers.hpp
	modules/stitching/include/opencv2/stitching/warpers.hpp
	modules/stitching/src/blenders.cpp
	modules/stitching/src/matchers.cpp
	modules/stitching/src/precomp.hpp
	modules/stitching/src/seam_finders.cpp
	modules/stitching/src/stitcher.cpp
	modules/stitching/src/warpers.cpp
	modules/viz/doc/widget.rst
	modules/viz/include/opencv2/viz/types.hpp
	modules/viz/include/opencv2/viz/viz3d.hpp
	modules/viz/include/opencv2/viz/widget_accessor.hpp
	modules/viz/src/precomp.hpp
	modules/viz/src/shapes.cpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkCloudMatSource.h
	modules/viz/test/test_precomp.hpp
	modules/viz/test/tests_simple.cpp
	samples/android/tutorial-4-cuda/CMakeLists.txt
	samples/android/tutorial-4-cuda/jni/Android.mk
	samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
	samples/cpp/stitching_detailed.cpp
	samples/cpp/tutorial_code/viz/creating_widgets.cpp
	samples/cpp/tutorial_code/viz/launching_viz.cpp
	samples/cpp/tutorial_code/viz/transformations.cpp
	samples/cpp/tutorial_code/viz/widget_pose.cpp
 2014-02-11 12:05:01 +04:00
Alexander Smorkalov
6ae4a9b09b Multiple improvements in OpenCV examples build. 
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
 2014-02-06 15:32:57 +04:00
Alexander Alekhin
0eb2be762a cmake: allow source_group to preserve file-system tree (for MSVS) 2013-12-07 14:38:59 +04:00
Alexander Alekhin
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
Alexander Alekhin
d571b28eaa cmake: fix bug with installation into OPENCV_LIB_INSTALL_PATH directory 2013-10-23 20:28:22 +04:00
Alexander Alekhin
83b7fbe376 cmake: cleanup OpenCVModules_TARGETS from cache 
This will allow to disable modules between cmake runs
 2013-10-17 23:43:33 +04:00
Alexander Alekhin
9941d3f71a cmake: restore find_package() for build directory 2013-10-15 23:05:40 +04:00
Alexander Alekhin
4adede4246 cmake: python module updates 2013-10-09 17:49:11 +04:00
Alexander Alekhin
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
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
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
0124902f42 Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows 2013-06-14 15:46:25 +04:00
Roman Donchenko
985bfea556 Don't resolve symlinks when looking for modules. 
We don't really need it, it makes the code longer, and it can lead to
inconsistent paths when OpenCV is itself inside a symlink.
 2013-06-05 17:17:13 +04:00
Dominik Rose
86ec9b79fd libd1394 2.x support for mingw on windows added 2013-05-14 16:30:12 +02:00
Andrey Kamaev
247df9f3fc Detect version of clang compiler 2013-02-13 14:11:56 +04:00
Andrey Kamaev
0b1fe53a46 Add -fobjc-exceptions flag to ObjectiveC sources if supported (bug #2657) 2013-01-29 17:09:23 +04:00
Anatoly Baksheev
d395bf1522 minor fix in FindTBB 
added texture_binder
 2012-08-23 13:37:27 +04:00
Andrey Kamaev
c474e27c1d One more fix for zlib search #1902 2012-07-09 19:16:38 +00:00
Andrey Kamaev
d48d7b2b46 Updated warning options for GCC; fixed new warnings. 2012-06-20 12:27:02 +00:00
Andrey Kamaev
a20837fb7c Fixed precompiled headers support detection 2012-06-18 06:53:13 +00:00
Andrey Kamaev
7cccc93bdf Fixed Android build warnings and few warnings in specific cnfigurations 2012-06-13 13:19:43 +00:00
Andrey Kamaev
cd19de45d3 Fixed problem with incorrect detection of some compiler flags 2012-06-13 11:40:05 +00:00
Andrey Kamaev
4ddcf06404 Added own CMake macro for compiler flag checks (to not depend on CMake version) 2012-06-12 16:11:30 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Andrey Kamaev
2f40905548 Fixed Android build 2012-06-08 08:11:17 +00:00
Andrey Kamaev
79df8db76f Fixed recently introduced build problems on some platforms 2012-06-08 06:19:17 +00:00
Andrey Kamaev
f62028dc16 Fixed mingw build. 2012-06-08 03:15:08 +00:00
Andrey Kamaev
c9027fecc0 Fixed few MinGW build problems 2012-05-20 18:45:19 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Andrey Kamaev
8991d323ea Refactored Java wrapper build scripts. 
Improved Android SDK search, fixed some bugs.
 2012-03-25 19:57:58 +00:00
Andrey Kamaev
ddc4ed4741 Added protection from modules redefinition and globbing recursion 2012-03-15 09:20:16 +00:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Andrey Kamaev
aa9eeddd86 Fixed problem with backslashes in cmake status report 2012-02-23 20:05:27 +00:00
Andrey Kamaev
4ac407e76a Small refactoring of OpenCV cmake options 2012-02-22 14:04: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
Andrey Kamaev
9d5c24cdc8 Updating opencv module definition in cmake (continued) 2012-01-25 09:04:49 +00:00
Andrey Kamaev
13f4e70e95 Updating opencv module definition in cmake 2012-01-24 16:55:47 +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