From 048318803fc3829ec5b3a773067e864d64e7d25a Mon Sep 17 00:00:00 2001
From: Peter Hristov <hristov@alinsure.cern.ch>
Date: Thu, 16 Jan 2014 18:06:31 +0100
Subject: [PATCH] Changes for icc

---
 LHAPDF/CMakeliblhapdf.pkg       |  2 +-
 MICROCERN/CMakelibmicrocern.pkg |  2 +-
 Vc/cmake/VcMacros.cmake         | 12 ++++---
 cmake/CMakelinuxx8664icc.cmake  | 58 +++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 cmake/CMakelinuxx8664icc.cmake

diff --git a/LHAPDF/CMakeliblhapdf.pkg b/LHAPDF/CMakeliblhapdf.pkg
index 12ae38098a4..ca710f2216b 100644
--- a/LHAPDF/CMakeliblhapdf.pkg
+++ b/LHAPDF/CMakeliblhapdf.pkg
@@ -41,7 +41,7 @@ set ( FSRCS  lhapdf5.5.1/src/alphas.f lhapdf5.5.1/src/commoninit.f lhapdf5.5.1/s
 
 if( ALICE_TARGET STREQUAL "solarisCC5")
 	  set ( PACKFFLAGS "${FFLAGS} -free")
-elseif( ALICE_TARGET STREQUAL "linuxicc")
+elseif( ALICE_TARGET STREQUAL "linuxx8664icc")
 	 	set ( PACKFFLAGS "${FFLAGS} -nofixed" )
 else()
 		set ( PACKFFLAGS "${FFLAGS} -ffree-form")
diff --git a/MICROCERN/CMakelibmicrocern.pkg b/MICROCERN/CMakelibmicrocern.pkg
index 1d331585dbe..7dcfeec1240 100644
--- a/MICROCERN/CMakelibmicrocern.pkg
+++ b/MICROCERN/CMakelibmicrocern.pkg
@@ -36,7 +36,7 @@ if(ALICE_TARGET MATCHES "macosx")
 
 endif(ALICE_TARGET MATCHES "macosx")
 
-set ( EINCLUDE )
+set ( EINCLUDE MICROCERN MICROCERN/kerngen)
 
 set ( PACKFFLAGS  "${FFLAGS} -IMICROCERN/kerngen")
 
diff --git a/Vc/cmake/VcMacros.cmake b/Vc/cmake/VcMacros.cmake
index d0c704666eb..1ae761e48c6 100644
--- a/Vc/cmake/VcMacros.cmake
+++ b/Vc/cmake/VcMacros.cmake
@@ -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}")
@@ -380,7 +380,9 @@ macro(vc_set_preferred_compiler_flags)
    endif()
 
    if(NOT Vc_COMPILER_IS_MSVC)
-      vc_add_compiler_flag(Vc_DEFINITIONS "-ffp-contract=fast")
+     if(NOT Vc_COMPILER_IS_INTEL)
+       vc_add_compiler_flag(Vc_DEFINITIONS "-ffp-contract=fast")
+     endif()
    endif()
 
    OptimizeForArchitecture()
@@ -536,8 +538,10 @@ macro(vc_compile_for_all_implementations _objs _src)
       _vc_compile_one_implementation(${_objs} AVX      "-mavx"    "-xAVX"    "/arch:AVX")
       if(NOT Vc_XOP_INTRINSICS_BROKEN)
          if(NOT Vc_FMA4_INTRINSICS_BROKEN)
-            _vc_compile_one_implementation(${_objs} SSE+XOP+FMA4 "-mxop -mfma4"        ""    "")
-            _vc_compile_one_implementation(${_objs} AVX+XOP+FMA4 "-mavx -mxop -mfma4"  ""    "")
+	   if (NOT Vc_COMPILER_IS_INTEL)
+             _vc_compile_one_implementation(${_objs} SSE+XOP+FMA4 "-mxop -mfma4"        ""    "")
+             _vc_compile_one_implementation(${_objs} AVX+XOP+FMA4 "-mavx -mxop -mfma4"  ""    "")
+	  endif()
          endif()
          _vc_compile_one_implementation(${_objs} SSE+XOP+FMA "-mxop -mfma"        ""    "")
          _vc_compile_one_implementation(${_objs} AVX+XOP+FMA "-mavx -mxop -mfma"  ""    "")
diff --git a/cmake/CMakelinuxx8664icc.cmake b/cmake/CMakelinuxx8664icc.cmake
new file mode 100644
index 00000000000..2e3231ee128
--- /dev/null
+++ b/cmake/CMakelinuxx8664icc.cmake
@@ -0,0 +1,58 @@
+# -*- mode: cmake -*-
+
+#--------------------------------------------------------------------------------#
+# Linuxx8664gcc CMake System configuration file for the AliRoot Build System     #
+#                                                                                # 
+# Author: Johny Jose (johny.jose@cern.ch)                                        #
+#                                                                                #
+#--------------------------------------------------------------------------------#
+
+
+cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
+
+#Retrieve Compiler Version
+
+# Global Optimization
+set(OPT)
+
+# ------- Setting optimization flags for default configuration -------
+
+if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+    set(DEFAULT_CXX_FLAGS "-O1 -g")
+    set(OPT "${DEFAULT_CXX_FLAGS}")
+    message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}")
+endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None"))
+
+# --------------------------------------------------------------------
+
+
+set(NOOPT "-g")
+
+set(CXXOPT ${OPT})
+set(CXXNOPT ${NOOPT})
+set(COPT ${OPT})
+set(FOPT ${OPT})
+
+#CERNLIB defines
+set(CLIBDEFS "-DCERNLIB_LINUX -DCERNLIB_BLDLIB -DCERNLIB_CZ")
+set(CLIBCXXOPTS)
+set(CLIBCOPT)
+set(CLIBFOPT ${CLIBDEFS})
+
+set(CXXWARN " ")
+
+set(CXXFLAGS "${OPT} -fPIC -Dlinux")
+set(CXXFLAGSNO "${NOOPT} -fPIC -Dlinux")
+add_definitions(-Dlinux)
+
+set(CFLAGS	"${OPT} -fPIC")
+set(FFLAGS "${CLIBFOPT} ${FOPT} -fPIC")
+
+set(SYSLIBS "-ldl -lcrypt -L/usr/X11R6/lib -lX11")
+
+set(LDFLAGS "${OPT}")
+set(SOFLAGS "${OPT} -shared")
+set(ALLIB)
+
+
+
-- 
2.39.3