From 15f8bc6f37d4e4f882b3a090da0179742b3e6dd0 Mon Sep 17 00:00:00 2001 From: Tomoaki Teshima Date: Mon, 6 Jun 2016 18:49:12 +0900 Subject: [PATCH] fix cmake * enable fp16 feature correctly with gcc on x86/x86_64 --- cmake/OpenCVCompilerOptions.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake index 33dd575243..8b2b54f81e 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)