Commit Graph

26 Commits

Author SHA1 Message Date
Manolis Stamatogiannakis
ef16e4203e Fix compile error with external TBB and -DBUILD_SHARED_LIBS=OFF.
Adds IMPORTED for the TBB::tbb alias target as otherwise cmake produces
the following error:

CMake Error: install(EXPORT "OpenCVModules" ...) includes target "opencv_core" which requires target "tbb" that is not in the export set.

This problem occurs with the defaults used by homebrew on macOS, which
compiles both static and shared versions of TBB and OpenCV.
2019-04-13 21:53:04 +02:00
Maksim Shabunin
b88609a921 Reduced direct TBB dependencies 2018-04-06 14:21:15 +03:00
Alexander Alekhin
08941b7890 cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars
- Recommended compiler checks:
  - GCC: CV_GCC
  - Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
  Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler
2018-03-27 16:16:59 +03:00
Maksim Shabunin
108d07c655 TBB: added workaround for linking issue with conflicting system and custom libraries 2018-02-03 14:27:46 +03:00
Maksim Shabunin
34a9ce6eb3 cmake: support searching for TBB via cmake package mechanism 2018-02-03 13:51:54 +03:00
Alexander Alekhin
25161fc56f tbb: don't search library in ENV{LD_LIBRARY_PATH}
ENV{LIBRARY_PATH} is enough
2017-10-10 14:18:28 +03:00
bradford barr
a56d7592f0 TBB Debug Release
OpenCV fails to detect tbb on a debug build if the platform has only installed
debug libraries.  This PR adds an additional check to the tbb detect logic for
systems that only install tbb debug and not both tbb debug and release.
2017-09-28 17:31:41 -04:00
Maksim Shabunin
e72d353b45 Download cache 2017-03-24 16:19:56 +03:00
mshabunin
695c518384 Updated TBB search script and code checks 2016-12-01 16:58:38 +03:00
atinfinity
d16723f493 changed to find TBB library(VS2015) 2015-12-23 23:45:33 +09:00
Sethur
c68d15bebe Fixed duplicate PATH in TBB_DEFAULT_INCLUDE_DIRS 2015-12-04 15:07:41 +01:00
Abhijit Kundu
26c8b3a38e Added suuport for finding Intel TBB for Visual Studio 2013 2014-04-28 07:23:49 -04:00
Alexander Smorkalov
7882aba7af TBB download and build option enabled for non Android platfroms. 2013-02-06 14:43:57 +04:00
Ivan Korolev
26c7e7f292 fix default include dirs for TBB 2013-01-30 17:17:04 +04:00
Anatoly Baksheev
f9ac5e2404 minor 2012-10-12 23:03:31 +04:00
Andrey Kamaev
b8767f5fbe Disable TBB on Android for mips 2012-09-06 18:54:38 +04:00
Anatoly Baksheev
d395bf1522 minor fix in FindTBB
added texture_binder
2012-08-23 13:37:27 +04:00
Andrey Kamaev
8748cbc232 Fixed optional dependencies tracking in CMake. Fixed TBB compiler definitions for Android. 2012-06-19 20:08:15 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Andrey Kamaev
8720b27d87 Fixed build with TBB for Android 2012-06-08 10:32:51 +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
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Andrey Kamaev
c6445e2de1 Slightly improved build of TBB for Android 2012-02-27 06:19:25 +00:00
Andrey Kamaev
22d7e6b741 Scripts for building TBB for Android 2012-02-24 18:16:05 +00:00
Vladislav Vinogradov
014577b433 fixed OpenCVDetectTBB.cmake (WIN32 x86 VS library path) 2012-02-06 06:11:23 +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