Merge 3.4 #14361
Merged
Merge 3.4 #14361
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
process defines from INTERFACE targets
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.
- drop legacy check_module() macro - drop 'ALIASOF_'
…m_interface_targets
alalek
commented
Apr 19, 2019
|
👍 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#13917 from sturkmen72:removed_c_api
#14308 from m000:master
#14313 from alalek:cmake_pch_fix_defines_from_interface_targets
#14315 from dkurt:tf_squeeze_and_slim_softmax_v2
#14318 from dkurt:fix_ie_github
#14328 from lainy:3.4
#14332 from LaurentBerger:loadknearest
#14337 from alalek:ts_flush_stdout
#14338 from alalek:fix_13849
#14341 from alalek:cmake_fix_pkgconfig_libs
#14343 from alalek:dnn_static_scans_namespace
#14345 from dkurt:fix_dnn_ie_mac
#14347 from dkurt:dnn_samples
#14354 from alalek:workaround_apple_dyld_bug
#14366 from alalek:win32_fix_pdb
Previous "Merge 3.4": #14320