[Avida-SVN] r1541 - development

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-05-11 10:57:32 -0400 (Fri, 11 May 2007)
New Revision: 1541

Modified:
   development/CMakeLists.txt
Log:
A couple more updates to CMakeLists to support HPC builds.  It is now possible to compile on Shaw without any manual modifications to the build system.

Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt	2007-05-11 14:48:52 UTC (rev 1540)
+++ development/CMakeLists.txt	2007-05-11 14:57:32 UTC (rev 1541)
@@ -30,13 +30,13 @@
 # This section defines default builtin compiler options
 # ------------------------------------------------------------------------------
 IF(UNIX)
-  IF (CMAKE_CXX_COMPILER MATCHES ".*pathcc.*")
+  IF (CMAKE_CXX_COMPILER MATCHES ".*pathCC.*")
+    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")
-  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 -fvisibility-inlines-hidden")
-  ENDIF (CMAKE_CXX_COMPILER MATCHES ".*pathcc.*")
+  ENDIF (CMAKE_CXX_COMPILER MATCHES ".*pathCC.*")
 
   # Four types of c++ compilations:
   # - debug (Debug)