Commit cd19de45 authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed problem with incorrect detection of some compiler flags

parent 694f0e95
...@@ -50,10 +50,10 @@ set(OCV_COMPILER_FAIL_REGEX ...@@ -50,10 +50,10 @@ set(OCV_COMPILER_FAIL_REGEX
MACRO(ocv_check_compiler_flag LANG FLAG RESULT) MACRO(ocv_check_compiler_flag LANG FLAG RESULT)
if("_${LANG}_" MATCHES "_CXX_") if("_${LANG}_" MATCHES "_CXX_")
set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx") set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx")
FILE(WRITE "${_fname}" "int main() { return 0;}\n") FILE(WRITE "${_fname}" "#pragma\nint main() { return 0; }\n")
elseif("_${LANG}_" MATCHES "_C_") elseif("_${LANG}_" MATCHES "_C_")
set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c") set(_fname "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c")
FILE(WRITE "${_fname}" "int main(void) { return 0;}\n") FILE(WRITE "${_fname}" "#pragma\nint main(void) { return 0; }\n")
else() else()
unset(_fname) unset(_fname)
endif() endif()
...@@ -64,7 +64,7 @@ MACRO(ocv_check_compiler_flag LANG FLAG RESULT) ...@@ -64,7 +64,7 @@ MACRO(ocv_check_compiler_flag LANG FLAG RESULT)
"${_fname}" "${_fname}"
COMPILE_DEFINITIONS "${FLAG}" COMPILE_DEFINITIONS "${FLAG}"
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
FOREACH(_regex ${OCV_COMPILER_FAIL_REGEX}) FOREACH(_regex ${OCV_COMPILER_FAIL_REGEX})
IF("${OUTPUT}" MATCHES "${_regex}") IF("${OUTPUT}" MATCHES "${_regex}")
SET(${RESULT} 0) SET(${RESULT} 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment