aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench/btl
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2015-11-27 10:18:39 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2015-11-27 10:18:39 +0100
commit0ff127e89675b3a4bf598fbb1317a3b85914916b (patch)
treee20cc0f68e7fe300f545880d1e31360baf5af9ec /bench/btl
parentca001d7c2a674da2da1a50f9aa122dafedb5123f (diff)
Preserve CMAKE_CXX_FLAGS in BTL
Diffstat (limited to 'bench/btl')
-rw-r--r--bench/btl/CMakeLists.txt21
1 files changed, 8 insertions, 13 deletions
diff --git a/bench/btl/CMakeLists.txt b/bench/btl/CMakeLists.txt
index 9444b450c..38ff9f483 100644
--- a/bench/btl/CMakeLists.txt
+++ b/bench/btl/CMakeLists.txt
@@ -11,29 +11,24 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
string(REGEX MATCH icpc IS_ICPC ${CMAKE_CXX_COMPILER})
IF(CMAKE_COMPILER_IS_GNUCXX OR IS_ICPC)
- SET(CMAKE_CXX_FLAGS "-g0 -O3 -DNDEBUG")
- SET(CMAKE_Fortran_FLAGS "-g0 -O3 -DNDEBUG")
- IF(NOT BTL_NOVEC)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -msse2")
- ELSE(NOT BTL_NOVEC)
+ SET(CMAKE_CXX_FLAGS "-g0 -O3 -DNDEBUG ${CMAKE_CXX_FLAGS}")
+ SET(CMAKE_Fortran_FLAGS "-g0 -O3 -DNDEBUG ${CMAKE_Fortran_FLAGS}")
+ IF(BTL_NOVEC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_DONT_VECTORIZE")
- ENDIF(NOT BTL_NOVEC)
+ ENDIF(BTL_NOVEC)
ENDIF(CMAKE_COMPILER_IS_GNUCXX OR IS_ICPC)
IF(MSVC)
SET(CMAKE_CXX_FLAGS " /O2 /Ot /GL /fp:fast -DNDEBUG")
# SET(CMAKE_Fortran_FLAGS "-g0 -O3 -DNDEBUG")
- IF(NOT BTL_NOVEC)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
- ELSE(NOT BTL_NOVEC)
+ IF(BTL_NOVEC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_DONT_VECTORIZE")
- ENDIF(NOT BTL_NOVEC)
+ ENDIF(BTL_NOVEC)
ENDIF(MSVC)
if(IS_ICPC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fast")
- set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fast")
+ set(CMAKE_CXX_FLAGS "-fast ${CMAKE_CXX_FLAGS}")
+ set(CMAKE_Fortran_FLAGS "-fast ${CMAKE_Fortran_FLAGS}")
endif(IS_ICPC)
include_directories(