forked from OSSInnovation/mindspore
opencv dislink openblas
This commit is contained in:
parent
a37e157697
commit
f460fc1cb5
|
@ -8,7 +8,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||||
set(opencv_CXXFLAGS "${opencv_CXXFLAGS} -Wno-attributes -Wno-unknown-pragmas")
|
set(opencv_CXXFLAGS "${opencv_CXXFLAGS} -Wno-attributes -Wno-unknown-pragmas")
|
||||||
set(opencv_CXXFLAGS "${opencv_CXXFLAGS} -Wno-unused-value -Wno-implicit-fallthrough")
|
set(opencv_CXXFLAGS "${opencv_CXXFLAGS} -Wno-unused-value -Wno-implicit-fallthrough")
|
||||||
else()
|
else()
|
||||||
set(opencv_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -D_FORTIFY_SOURCE=2 -D_GLIBCXX_USE_CXX11_ABI=0 -O2")
|
set(opencv_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -D_FORTIFY_SOURCE=2")
|
||||||
|
set(opencv_CXXFLAGS "${opencv_CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0 -O2")
|
||||||
set(opencv_CFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -D_FORTIFY_SOURCE=2 -O2")
|
set(opencv_CFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter -D_FORTIFY_SOURCE=2 -O2")
|
||||||
set(opencv_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
|
set(opencv_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack")
|
||||||
endif()
|
endif()
|
||||||
|
@ -44,6 +45,7 @@ if(WIN32)
|
||||||
-DBUILD_TIFF=OFF
|
-DBUILD_TIFF=OFF
|
||||||
-DWITH_JASPER=OFF
|
-DWITH_JASPER=OFF
|
||||||
-DBUILD_JASPER=OFF
|
-DBUILD_JASPER=OFF
|
||||||
|
-DWITH_LAPACK=OFF
|
||||||
-DTIFF_INCLUDE_DIR=${tiff_INC}
|
-DTIFF_INCLUDE_DIR=${tiff_INC}
|
||||||
-DTIFF_LIBRARY=${tiff_LIB})
|
-DTIFF_LIBRARY=${tiff_LIB})
|
||||||
else()
|
else()
|
||||||
|
@ -67,6 +69,7 @@ else()
|
||||||
-DBUILD_TIFF=OFF
|
-DBUILD_TIFF=OFF
|
||||||
-DWITH_JASPER=OFF
|
-DWITH_JASPER=OFF
|
||||||
-DBUILD_JASPER=OFF
|
-DBUILD_JASPER=OFF
|
||||||
|
-DWITH_LAPACK=OFF
|
||||||
-DTIFF_INCLUDE_DIR=${tiff_INC}
|
-DTIFF_INCLUDE_DIR=${tiff_INC}
|
||||||
-DTIFF_LIBRARY=${tiff_LIB})
|
-DTIFF_LIBRARY=${tiff_LIB})
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue