mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 23:33:05 +04:00
cmake: prefer using CMAKE_SYSTEM_PROCESSOR / CMAKE_SIZEOF_VOID_P
Drop: - discouraged CMAKE_CL_64 - MSVC64 - MINGW64
This commit is contained in:
@@ -80,7 +80,7 @@ endif()
|
||||
if (WIN32 AND HAVE_DSHOW)
|
||||
list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_dshow.cpp)
|
||||
list(APPEND videoio_hdrs ${CMAKE_CURRENT_LIST_DIR}/src/cap_dshow.hpp)
|
||||
if (MINGW64)
|
||||
if(MINGW AND X86_64)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTRSAFE_NO_DEPRECATE")
|
||||
endif()
|
||||
endif()
|
||||
@@ -267,7 +267,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-deprecated-declarations)
|
||||
|
||||
if(WIN32 AND HAVE_FFMPEG_WRAPPER)
|
||||
#copy ffmpeg dll to the output folder
|
||||
if(MSVC64 OR MINGW64)
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
set(FFMPEG_SUFFIX _64)
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user