mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19519 from alalek:issue_19485

Browse Source
This commit is contained in:
Alexander Alekhin 2021-02-15 15:15:27 +00:00
commit 76cc034df2
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/OpenCVUtils.cmake
View File

@ -564,7 +564,11 @@ macro(ocv_check_flag_support lang flag varname base_options)
elseif("_${lang}_" MATCHES "_C_") elseif("_${lang}_" MATCHES "_C_")
set(_lang C) set(_lang C)
elseif("_${lang}_" MATCHES "_OBJCXX_") elseif("_${lang}_" MATCHES "_OBJCXX_")
set(_lang OBJCXX) if(DEFINED CMAKE_OBJCXX_COMPILER) # CMake 3.16+ and enable_language(OBJCXX) call are required
set(_lang OBJCXX)
else()
set(_lang CXX)
endif()
else() else()
set(_lang ${lang}) set(_lang ${lang})
endif() endif()
@ -573,7 +577,9 @@ macro(ocv_check_flag_support lang flag varname base_options)
string(REGEX REPLACE "^(/|-)" "HAVE_${_lang}_" ${varname} "${${varname}}") string(REGEX REPLACE "^(/|-)" "HAVE_${_lang}_" ${varname} "${${varname}}")
string(REGEX REPLACE " -|-|=| |\\.|," "_" ${varname} "${${varname}}") string(REGEX REPLACE " -|-|=| |\\.|," "_" ${varname} "${${varname}}")
ocv_check_compiler_flag("${_lang}" "${base_options} ${flag}" ${${varname}} ${ARGN}) if(DEFINED CMAKE_${_lang}_COMPILER)
ocv_check_compiler_flag("${_lang}" "${base_options} ${flag}" ${${varname}} ${ARGN})
endif()
endmacro() endmacro()
macro(ocv_check_runtime_flag flag result) macro(ocv_check_runtime_flag flag result)

2
modules/highgui/CMakeLists.txt
View File

@ -151,7 +151,7 @@ ocv_create_module(${HIGHGUI_LIBRARIES})
macro(ocv_highgui_configure_target) macro(ocv_highgui_configure_target)
if(APPLE) if(APPLE)
add_apple_compiler_options(the_module) add_apple_compiler_options(${the_module})
endif() endif()
if(MSVC) if(MSVC)

2
modules/imgcodecs/CMakeLists.txt
View File

@ -131,7 +131,7 @@ ocv_create_module(${GRFMT_LIBS} ${IMGCODECS_LIBRARIES})
macro(ocv_imgcodecs_configure_target) macro(ocv_imgcodecs_configure_target)
if(APPLE) if(APPLE)
add_apple_compiler_options(the_module) add_apple_compiler_options(${the_module})
endif() endif()
if(MSVC) if(MSVC)

2
modules/videoio/CMakeLists.txt
View File

@ -253,7 +253,7 @@ ocv_create_module(${VIDEOIO_LIBRARIES})
macro(ocv_videoio_configure_target) macro(ocv_videoio_configure_target)
if(APPLE) if(APPLE)
add_apple_compiler_options(the_module) add_apple_compiler_options(${the_module})
endif() endif()
if(MSVC) if(MSVC)