From: Tomoaki Teshima Date: Mon, 6 Jun 2016 09:49:12 +0000 (+0900) Subject: fix cmake X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1748^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15f8bc6f37d4e4f882b3a090da0179742b3e6dd0;p=platform%2Fupstream%2Fopencv.git fix cmake * enable fp16 feature correctly with gcc on x86/x86_64 --- diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake index 33dd575..8b2b54f 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake @@ -170,9 +170,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) add_extra_compiler_option(-mfma) endif() endif() - if((X86 OR X86_64) AND NOT MSVC) - add_extra_compiler_option(-mf16c) - endif((X86 OR X86_64) AND NOT MSVC) # GCC depresses SSEx instructions when -mavx is used. Instead, it generates new AVX instructions or AVX equivalence for all SSEx instructions when needed. if(NOT OPENCV_EXTRA_CXX_FLAGS MATCHES "-mavx") @@ -204,6 +201,9 @@ if(CMAKE_COMPILER_IS_GNUCXX) add_extra_compiler_option(-mpopcnt) endif() endif() + if((X86 OR X86_64) AND NOT MSVC) + add_extra_compiler_option(-mf16c) + endif((X86 OR X86_64) AND NOT MSVC) endif(NOT MINGW) if(X86 OR X86_64)