[Avida-SVN] r2160 - branches/matt/RandomSearch
matt at myxo.css.msu.edu
matt at myxo.css.msu.edu
Mon Oct 29 12:33:44 PDT 2007
Author: matt
Date: 2007-10-29 15:33:43 -0400 (Mon, 29 Oct 2007)
New Revision: 2160
Modified:
branches/matt/RandomSearch/CMakeLists.txt
Log:
Added correct CMakeLists.txt
Modified: branches/matt/RandomSearch/CMakeLists.txt
===================================================================
--- branches/matt/RandomSearch/CMakeLists.txt 2007-10-29 19:01:54 UTC (rev 2159)
+++ branches/matt/RandomSearch/CMakeLists.txt 2007-10-29 19:33:43 UTC (rev 2160)
@@ -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 -fvisibility-inlines-hidden")
+ 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)
@@ -299,7 +308,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