[Avida-SVN] r2841 - branches/matt/PairwiseEpistasis
ruppmatt at myxo.css.msu.edu
ruppmatt at myxo.css.msu.edu
Mon Oct 13 16:37:22 PDT 2008
Author: ruppmatt
Date: 2008-10-13 19:37:21 -0400 (Mon, 13 Oct 2008)
New Revision: 2841
Modified:
branches/matt/PairwiseEpistasis/CMakeLists.txt
Log:
Updated CMakeLists.txt to support HPC class 92 (Intel/SGI).
Modified: branches/matt/PairwiseEpistasis/CMakeLists.txt
===================================================================
--- branches/matt/PairwiseEpistasis/CMakeLists.txt 2008-10-13 20:01:43 UTC (rev 2840)
+++ branches/matt/PairwiseEpistasis/CMakeLists.txt 2008-10-13 23:37:21 UTC (rev 2841)
@@ -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)
More information about the Avida-cvs
mailing list