potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-08-16 18:48:08 +03:00
parent a41b79d43e b8f35aa109
commit 19a4b51371
22 changed files with 291 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVCompilerOptions.cmake
-5
View File
@@ -285,11 +285,6 @@ if(MSVC)
endif()
endif()
# Adding additional using directory for WindowsPhone 8.0 to get Windows.winmd properly
if(WINRT_PHONE AND WINRT_8_0)
set(OPENCV_EXTRA_CXX_FLAGS "${OPENCV_EXTRA_CXX_FLAGS} /AI\$(WindowsSDK_MetadataPath)")
endif()
include(cmake/OpenCVCompilerOptimizations.cmake)
if(COMMAND ocv_compiler_optimization_options)
ocv_compiler_optimization_options()