[Avida-SVN] r2588 - stable

[matt at myxo.css.msu.edu]

Author: matt
Date: 2008-05-20 15:47:26 -0400 (Tue, 20 May 2008)
New Revision: 2588

Modified:
   stable/CMakeLists.txt
Log:
Updated CMakeLists.txt to work with HPC intel cluster.


Modified: stable/CMakeLists.txt
===================================================================
--- stable/CMakeLists.txt	2008-05-19 19:22:36 UTC (rev 2587)
+++ stable/CMakeLists.txt	2008-05-20 19:47:26 UTC (rev 2588)
@@ -34,13 +34,22 @@
     SET(COMPILER_WARNING_FLAGS "")
     SET(COMPILER_OPTIMIZATION_FLAGS "-ffast-math -fno-rtti -funroll-loops -fstrict-aliasing -OPT:Olimit=0")
   ELSE (CMAKE_CXX_COMPILER MATCHES ".*pathCC.*")
-    SET(COMPILER_WARNING_FLAGS "-Wextra -Wno-unknown-pragmas -Wconversion -Wno-trigraphs")
-    SET(COMPILER_OPTIMIZATION_FLAGS "-ffast-math -fno-rtti -funroll-loops -fstrict-aliasing -ftree-vectorize")
+    IF (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
+      SET(COMPILER_WARNING_FLAGS "")
+      SET(COMPILER_OPTIMIZATION_FLAGS "")
+    ELSE (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
+      SET(COMPILER_WARNING_FLAGS "-Wextra -Wno-unknown-pragmas -Wconversion -Wno-trigraphs")
+      SET(COMPILER_OPTIMIZATION_FLAGS "-ffast-math -fno-rtti -funroll-loops -fstrict-aliasing -ftree-vectorize -fvisibility-inlines-hidden")
+    ENDIF (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
   ENDIF (CMAKE_CXX_COMPILER MATCHES ".*pathCC.*")
 
   INCLUDE(CheckCSourceCompiles)
-  SET(CMAKE_REQUIRED_FLAGS "-mno-fused-madd")
-  CHECK_C_SOURCE_COMPILES("int main() { return 0; }" HAVE_FUSED_MADD)
+  IF (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
+    SET(HAVE_FUSED_MADD FALSE)
+  ELSE (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
+    SET(CMAKE_REQUIRED_FLAGS "-mno-fused-madd")
+    CHECK_C_SOURCE_COMPILES("int main() { return 0; }" HAVE_FUSED_MADD)
+  ENDIF (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
   SET(CMAKE_REQUIRED_FLAGS "")
 
   IF(HAVE_FUSED_MADD)
@@ -281,7 +290,11 @@
 # Build Instructions for the TCMalloc library
 # ------------------------------------------------------------------------------
 IF(UNIX)
-  SET(AVD_ENABLE_TCMALLOC TRUE)
+  IF (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
+    SET(AVD_ENABLE_TCMALLOC FALSE)
+  ELSE (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
+    SET(AVD_ENABLE_TCMALLOC TRUE)
+  ENDIF (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
 ELSE(UNIX)
   SET(AVD_ENABLE_TCMALLOC FALSE)
 ENDIF(UNIX)