[Avida-SVN] r2115 - in development: . documentation

[baerb at myxo.css.msu.edu]

Author: baerb
Date: 2007-09-27 16:48:16 -0400 (Thu, 27 Sep 2007)
New Revision: 2115

Modified:
   development/CMakeLists.txt
   development/documentation/environment.html
Log:

Made minor addition to example in environment.hml file

Modified the CMake configuration file so that it will reconize the Intel
compiler



Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt	2007-09-27 01:20:54 UTC (rev 2114)
+++ development/CMakeLists.txt	2007-09-27 20:48:16 UTC (rev 2115)
@@ -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)
@@ -301,7 +310,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)

Modified: development/documentation/environment.html
===================================================================
--- development/documentation/environment.html	2007-09-27 01:20:54 UTC (rev 2114)
+++ development/documentation/environment.html	2007-09-27 20:48:16 UTC (rev 2115)
@@ -266,8 +266,8 @@
 from the top and flows towards the bottom where it exits the system,
 you could use:
 <pre>
-  RESOURCE lactose:initial=100000:inflow=100:outflow=0.1:inflowx1=0:\
-  inflowx2=100:inflowy1=0:inflowy2=0:outflowx1=0:outflowx2=100:\
+  RESOURCE lactose:geometry=grid:initial=100000:inflow=100:outflow=0.1:\
+  inflowx1=0:inflowx2=100:inflowy1=0:inflowy2=0:outflowx1=0:outflowx2=100:\
   outflowy1=100:outflowy2=100:ygravity=0.5
 </pre>
 </p>