From 7a4bd337d9d78a7885df3e4f7e7fbe3ebb27eed7 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Fri, 29 Apr 2016 13:42:22 -0700 Subject: Resolved merge conflict --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 5546184a8..957b6b13f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,17 +221,16 @@ if(NOT MSVC) message(STATUS "Enabling FMA in tests/examples") endif() -<<<<<<< local option(EIGEN_TEST_AVX512 "Enable/Disable AVX512 in tests/examples" OFF) if(EIGEN_TEST_AVX512) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx512f -mavx512dq") message(STATUS "Enabling AVX512 in tests/examples") -======= + endif() + option(EIGEN_TEST_F16C "Enable/Disable F16C in tests/examples" OFF) if(EIGEN_TEST_F16C) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mf16c") message(STATUS "Enabling F16C in tests/examples") ->>>>>>> other endif() option(EIGEN_TEST_ALTIVEC "Enable/Disable AltiVec in tests/examples" OFF) -- cgit v1.2.3