mirror of
https://github.com/opencv/opencv.git
synced 2024-11-27 20:50:25 +08:00
Debug build for WindowsRT with TBB fixed.
Debug library name prefix changed no "_debug" to fit pragmas in TBB headers.
This commit is contained in:
parent
886c009da6
commit
a64eccd2cd
8
3rdparty/tbb/CMakeLists.txt
vendored
8
3rdparty/tbb/CMakeLists.txt
vendored
@ -230,9 +230,15 @@ endif()
|
||||
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations)
|
||||
string(REPLACE "-Werror=non-virtual-dtor" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||
|
||||
if (WIN32)
|
||||
set(tbb_debug_postfix "_debug") # to fit pragmas in _windef.h inside TBB
|
||||
else()
|
||||
set(tbb_debug_postfix ${OPENCV_DEBUG_POSTFIX})
|
||||
endif()
|
||||
|
||||
set_target_properties(tbb
|
||||
PROPERTIES OUTPUT_NAME tbb
|
||||
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
|
||||
DEBUG_POSTFIX "${tbb_debug_postfix}"
|
||||
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
|
||||
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user