e56d6054aa
Do not build protobuf without dnn ( #10689 )
...
* Do not build protobuf if dnn is disabled
* Added BUILD_LIST cmake option to the cache
* Moved protobuf to the top level
* Fixed static build
* Fixed world build
* fixup! Fixed world build
2018-02-01 16:30:23 +03:00
88225eb65e
ocl: fix world compilation on Windows
2017-10-11 19:04:42 +03:00
a9cc87636f
build: update modules descriptions
2017-06-20 15:45:23 +03:00
17e5e4cd5a
core: CPU target dispatcher update
...
- use suffixes like '.avx.cpp'
- added CMake-generated files for '.simd.hpp' optimization approach
- wrap HAL intrinsic headers into separate namespaces for different build flags
- automatic vzeroupper insertion (via CV_INSTRUMENT_REGION macro)
2017-03-23 16:12:11 +03:00
36b34465a4
cmake: include contrib modules into opencv_world
2017-01-23 18:45:53 +03:00
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
a34fbf7bb1
Fixed identifiers warns
2016-09-30 15:16:29 +05:30
c75f9c80c7
cmake: turn off precompiled headers in case of opencv_world builds
2016-01-15 19:43:24 +03:00
c8ff7a4867
build: fix opencv_world with CUDA
2016-01-14 17:23:55 +03:00
be23846c4e
update osx and ios build_framework.py
2015-12-17 16:17:31 +03:00
8184e57dd6
fix tests build (win,shared,world)
2015-06-05 16:30:36 +03:00
e7c02f376f
Fixed world build with HAL
2015-04-08 19:56:17 +03:00
c28fea32c7
Build separate world-like iOS framework for contrib
2014-12-05 17:48:28 +03:00
dcee883961
fixed MSVC warnings and iOS framework compile error
2014-10-18 21:58:34 +04:00
8d9e619412
fixed opencv_world build
2014-10-17 16:05:38 +04:00
d27e440b2a
continue fixing nonfree elements
...
fixed dependency of stitching module on xfeatures2d module as optional
fixed the initModule_xfeatures2d function that was called in module stitching since it is in another namespace than the standard cv one.
2014-08-28 13:30:47 +02:00
564a8ed208
adapted all nonfree header inclusion since it doesn't exist anymore as a module
2014-08-25 21:31:34 +02:00
03435c0d74
fix IOS framework
2014-08-08 15:57:54 +04:00
55188fe991
world fix
2014-08-05 20:12:35 +04:00
92ead5fab3
Fix cmake to build OpenCV framework on OSX
2014-07-01 22:31:57 +03:00
313a0ad255
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/internal.hpp
modules/core/src/arithm.cpp
modules/imgproc/src/imgwarp.cpp
modules/objdetect/src/hog.cpp
2014-05-12 17:38:07 +04:00
3d25d70627
fix for compiling 2.4 opencv with xcode 5.1
2014-04-18 13:42:47 +02:00
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
5852a913a8
CMake's get_filename_component with NAME_WE parameters, interprets first period as start of extension. For. e.g file name with out extension of 'this.is.a.text.file.txt' will be taken as 'this'. Hence using NAME with regex replacement to get 'this.is.a.text.file'
2013-11-08 14:09:34 +05:30
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
7fa01e3fcc
enabled png and jpeg for iOS
2013-03-25 11:19:29 +04:00
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
c5df95d5a9
Shortened cmake script for opencv_world
2012-06-15 07:52:20 +00:00
76f49f3078
added script to build the universal opencv2.framework for iOS device and simulator. fixed opencv_world cmake script to create static libopencv_world.a for iOS. temporarily disable compressed file storages in the case of iOS (to avoid dependency of zlib)
2012-06-09 16:18:39 +00:00
5a41c6509e
Fixed build of opencv_world with QT on linux #2012
2012-06-06 13:24:41 +00:00
37d9c3f835
Fixed some corner cases of opencv_world configuration
2012-05-21 20:15:17 +00:00
fd68cc768a
fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876 )
2012-05-21 14:56:07 +00:00
8d135e8ea1
Shortened CMake script for opencv_world. Fixed opencv_world link with non-Visual Studio generators on Windows.
2012-05-13 09:34:33 +00:00
6dde56faf4
fixed building opencv_world with VS2010
2012-05-12 16:27:40 +00:00
9bbcebd6b0
added opencv_world module that combines all the other [selected by user] OpenCV modules, except for opencv_python and opencv_gpu.
2012-05-12 13:54:26 +00:00
Maksim Shabunin