generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed problem with incorrect detection of some compiler flags

Browse Source
This commit is contained in:
Andrey Kamaev 2012-06-13 11:40:05 +00:00
parent 694f0e954f
commit cd19de45d3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/OpenCVUtils.cmake
View File

@ -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)
"${_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)