generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5337 from Dikay900:tbb_cmake_visibility

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-09-14 11:47:04 +00:00
commit 07a4f571d9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3rdparty/tbb/CMakeLists.txt vendored
View File

@ -212,7 +212,13 @@ else()
endif() endif()
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations)
string(REPLACE "-Werror=non-virtual-dtor" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
# filter out flags that are not handled well by the TBB code
foreach(var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_DEBUG)
string(REPLACE "-Werror=non-virtual-dtor" "" ${var} "${${var}}")
string(REPLACE "-fvisibility=hidden" "" ${var} "${${var}}")
string(REPLACE "-fvisibility-inlines-hidden" "" ${var} "${${var}}")
endforeach()
if (WIN32) if (WIN32)
set(tbb_debug_postfix "_debug") # to fit pragmas in _windef.h inside TBB set(tbb_debug_postfix "_debug") # to fit pragmas in _windef.h inside TBB