Commit Graph

54 Commits

Author SHA1 Message Date
Alexander Alekhin e2a5a6a05c Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-09-25 18:32:44 +00:00
takacsd e0be771b64 Add option to disable features in iOS build. 2019-09-24 17:42:35 +02:00
Alexander Alekhin a7b954f655 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-08-23 19:24:37 +03:00
Giles Payne 96d5cbd036 Merge pull request #15350 from komakai:apple-debug-build
* Add debug build option to MacOs and iOS build scripts

* osx: allow selection of MACOSX_DEPLOYMENT_TARGET

* Add --debug_info flag to iOS and macOS builds for building with debug info
2019-08-23 18:22:29 +03:00
luz.paz fcc7d8dd4e Fix modules/ typos
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`

backporting of commit: ec43292e1e
2019-08-16 17:34:29 +03:00
luz.paz ec43292e1e Fix modules/ typos
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
2019-08-15 18:02:09 -04:00
Alexander Alekhin b95e93c20a Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-06-26 20:19:04 +00:00
Dal Rupnik e755c66418 [#14873] Fix code signing issue in Try Compile script 2019-06-25 10:02:54 +02:00
Alexander Alekhin c3cf35ab63 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-02-26 17:34:42 +03:00
Alexander Alekhin a065c10bcb cmake: workaround iOS try_compile(COPY_FILE) bug 2019-02-25 21:35:46 +00:00
Alexander Alekhin 0c16d8f6c3 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-12-13 15:12:26 +03:00
Adrian Kashivskyy 00285a5e88 Merge pull request #13424 from akashivskyy:pr/ios-nonfree
Add ability to build iOS and macOS frameworks with nonfree modules (#13424)

* Allow building ios framework with nonfree

* Allow building osx framework with nonfree
2018-12-12 17:32:19 +03:00
Alexander Alekhin 2e0150e601 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-12-03 18:38:27 +03:00
Adrian Kashivskyy b7c134617d Add ability to specify iPhoneSimulator ARCHS 2018-11-28 19:27:20 +01:00
Alexander Alekhin 50bec53afc Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-26 17:56:55 +03:00
Alexander Alekhin 9a76322ef9 ios: update build script
- IPHONEOS_DEPLOYMENT_TARGET=8.0 by default (minimal for XCode 10)
2018-10-24 04:37:31 +00:00
Alexander Alekhin 690fb0544c Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-02 14:31:05 +03:00
Andrew Mroczkowski 3c5a6be835 Fix Xcode version parsing error (affects bitcode generation)
The regex was only parsing for a single digit in the major version, causing Xcode 10 to be treated as version "1". Other parts of the script only turn on bitcode generation if the Xcode version is > 7.
2018-09-28 17:01:40 +03:00
Alexander Alekhin a956732874 cmake: update install paths (Linux) 2018-09-19 15:43:52 +03:00
Alexander Alekhin 879e046b22 Merge pull request #12586 from Slyce-Inc:bug-xcode10-compile 2018-09-19 10:58:51 +00:00
Andrew Mroczkowski b6d5565df1 build: fix Xcode 10 build problems
Updating the base SDK from 6.0 to 8.0 where applicable
2018-09-18 15:42:03 -04:00
Vadim Pisarevsky 80b62a41c6 Merge pull request #12411 from vpisarev:wide_convert
* rewrote Mat::convertTo() and convertScaleAbs() to wide universal intrinsics; added always-available and SIMD-optimized FP16<=>FP32 conversion

* fixed compile warnings

* fix some more compile errors

* slightly relaxed accuracy threshold for int->float conversion (since we now do it using single-precision arithmetics, not double-precision)

* fixed compile errors on iOS, Android and in the baseline C++ version (intrin_cpp.hpp)

* trying to fix ARM-neon builds

* trying to fix ARM-neon builds

* trying to fix ARM-neon builds

* trying to fix ARM-neon builds
2018-09-06 19:36:59 +03:00
Ben John 2f0060e399 Merge pull request #10923 from Preventis:patch-ios
Fixed dynamic build script for iOS (#10923)

* Readded UIDeviceFamily (was removed in beec247)

* Added correct bitcode flag to python build script for iOS

* Missed the bitcodedisabled check

* Corrected the syntax in my proposed changes
2018-03-13 16:09:26 +03:00
Alexander Alekhin af1ea1f7ac build: fix iOS warnings with armv7s, switch precommit armv7 -> armv7s 2017-12-06 15:49:45 +03:00
Alexander Alekhin cdc2aca2cc cmake: fix iOS build with CMake 3.10 2017-11-29 15:57:32 +03:00
Alexander Alekhin f7913e2c84 build: eliminate Xcode 9.1 warnings
- 3rdparty/libjasper/jas_getopt.c:129:25: warning: this function declaration is not a prototype [-Wstrict-prototypes]
- clang: warning: optimization flag '-fomit-frame-pointer' is not supported for target 'armv7' [-Wignored-optimization-argument]
2017-11-28 17:48:40 +03:00
Yuriy Solovyov 96f1ef1347 Fix buildcmd 2017-05-02 18:59:37 +03:00
Yuriy Solovyov 4f6238aa04 Use all available cpu cores in iOS/OSX build procedure 2017-05-02 18:48:54 +03:00
Alexander Alekhin f1c8e04268 ios framework: don't disable opencv_world in dynamic framework 2017-02-21 13:37:37 +03:00
Alexander Alekhin a78d143c98 ios framework: refactor code (no functional changes) 2017-02-21 13:37:37 +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 4c8d25878b cmake: update configuration for iOS 2016-10-12 23:43:29 +03:00
Alexander Alekhin fa87422026 Merge pull request #7358 from convoyinc:ios-framework-module-exclusion 2016-10-02 11:38:59 +00:00
Ian MacLeod b78f1ad823 Support for blacklisting modules when building iOS and OS X frameworks 2016-09-28 14:46:40 -07:00
Alexander Alekhin 1734f435f7 ios: reduce number of test configurations in precommit builds 2016-08-11 13:48:06 +03:00
Pierre Dulac 262a52f306 Enable NEON for the arm64 architecture too
and fix the compilation for iOS in the same time
2016-01-05 15:34:39 +01:00
Alexander Alekhin be23846c4e update osx and ios build_framework.py 2015-12-17 16:17:31 +03:00
Maksim Shabunin e8bf4417ef New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2 2015-11-17 15:30:01 +03:00
Maksim Shabunin a5a510da4b Support for compound modules, support for contrib_world 2015-02-10 18:30:05 +03:00
Maksim Shabunin c28fea32c7 Build separate world-like iOS framework for contrib 2014-12-05 17:48:28 +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 420737e098 Fixing iOS clang warnings, part 1 2014-10-17 18:14:54 +04:00
Maksim Shabunin f379bcc6d3 Suppressed some iOS framework compilation warnings 2014-10-17 18:14:53 +04:00
Ilya Lavrenov c54ef78220 fixes 2014-10-16 09:55:22 +04:00
Ilya Lavrenov 69c82b4c2b ability to compile for iOS with Neon 2014-10-13 22:57:50 +04:00
Alessandro Trebbi 3d25d70627 fix for compiling 2.4 opencv with xcode 5.1 2014-04-18 13:42:47 +02:00
Alexander Shishkov 9631cb6de9 fix for supporting 64-bit architecture 2013-11-20 18:08:05 +04:00
Roman Donchenko 9bb1a7d34d Merge pull request #1234 from SpecLad:ios-plist 2013-08-23 15:43:08 +04:00
Alexander Shishkov 16814c7fb1 Update build_framework.py 2013-08-23 12:51:50 +04:00