potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2025-09-26 09:24:38 +03:00
parent 664096aafd edfa999b93
commit 1a74264ee9
91 changed files with 5339 additions and 1508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVCompilerDefenses.cmake
+1 -1
View File
@@ -41,7 +41,7 @@ if(MSVC)
ocv_add_defense_compiler_flag("/guard:cf")
ocv_add_defense_compiler_flag("/w34018 /w34146 /w34244 /w34267 /w34302 /w34308 /w34509 /w34532 /w34533 /w34700 /w34789 /w34995 /w34996")
set(OPENCV_LINKER_DEFENSES_FLAGS_COMMON "${OPENCV_LINKER_DEFENSES_FLAGS_COMMON} /guard:cf /dynamicbase" )
if(NOT X86_64)
if(X86)
set(OPENCV_LINKER_DEFENSES_FLAGS_COMMON "${OPENCV_LINKER_DEFENSES_FLAGS_COMMON} /safeseh")
endif()
elseif(CV_CLANG)
cmake/OpenCVFindLAPACK.cmake
+1 -1
View File
@@ -200,7 +200,7 @@ if(WITH_LAPACK)
CBLAS_H "cblas.h"
LAPACKE_H "lapacke.h"
INCLUDE_DIR "${OpenBLAS_INCLUDE_DIRS}"
LIBRARIES "${OpenBLAS_LIBRARIES}")
LIBRARIES "${OpenBLAS_LIBRARY};${OpenBLAS_LIBRARIES}")
endif()
endif()
if(NOT LAPACK_LIBRARIES AND UNIX)