Removing extra slash and switching off -ffp-contract=fast for icc
authorhristov <Peter.Hristov@cern.ch>
Tue, 20 May 2014 18:11:00 +0000 (20:11 +0200)
committerhristov <Peter.Hristov@cern.ch>
Tue, 20 May 2014 18:11:00 +0000 (20:11 +0200)
Vc/cmake/VcMacros.cmake

index 16000db..72616b1 100644 (file)
@@ -50,7 +50,7 @@ macro(vc_determine_compiler)
       set(Vc_COMPILER_IS_CLANG false)
       set(Vc_COMPILER_IS_MSVC false)
       set(Vc_COMPILER_IS_GCC false)
-      if(CMAKE_CXX_COMPILER MATCHES "/(icpc|icc)$")
+      if(CMAKE_CXX_COMPILER MATCHES "(icpc|icc)$")
          set(Vc_COMPILER_IS_INTEL true)
          exec_program(${CMAKE_C_COMPILER} ARGS -dumpversion OUTPUT_VARIABLE Vc_ICC_VERSION)
          message(STATUS "Detected Compiler: Intel ${Vc_ICC_VERSION}")
@@ -375,7 +375,7 @@ macro(vc_set_preferred_compiler_flags)
       endif()
    endif()
 
-   if(NOT Vc_COMPILER_IS_MSVC)
+   if(NOT Vc_COMPILER_IS_MSVC AND NOT Vc_COMPILER_IS_INTEL)
       vc_add_compiler_flag(Vc_DEFINITIONS "-ffp-contract=fast")
    endif()