Removing useless files

[u/mrichter/AliRoot.git] / Vc / CMakeLists.txt

diff --git a/Vc/CMakeLists.txt b/Vc/CMakeLists.txt
index d9b74de39dc11bb8fe9b23002f27e6ab0c12186f..d51cf454c90c998742b0bbe06c2824f23f838a14 100644 (file)
--- a/Vc/CMakeLists.txt
+++ b/Vc/CMakeLists.txt
@@ -3,29 +3,13 @@ include("${Vc_CMAKE_MODULES_DIR}/AddTargetProperty.cmake")
 include_directories("${Vc_INCLUDE_DIR}")
 
 string(REPLACE "-Weffc++" "" CXXFLAGS "${CXXFLAGS}")
-set(libvc_compile_flags "-DVC_COMPILE_LIB ${CXXFLAGS} -O3 ${Vc_DEFINITIONS}")
-vc_compile_for_all_implementations(_objs src/trigonometric.cpp FLAGS ${libvc_compile_flags}
+
+set(libvc_compile_flags "-DVC_COMPILE_LIB ${CXXFLAGS} -O3")
+vc_compile_for_all_implementations(_objs0 src/trigonometric.cpp FLAGS ${libvc_compile_flags}
       ONLY SSE2 SSE3 SSSE3 SSE4_1 AVX SSE+XOP+FMA4 AVX+XOP+FMA4)
-set(_srcs src/const.cpp src/cpuid.cpp src/support.cpp ${_objs})
-if(USE_AVX)
-   list(APPEND _srcs src/avx_sorthelper.cpp)
-else()
-   if(NOT Vc_AVX_INTRINSICS_BROKEN)
-      # we'd still like to have avx_sorthelper.cpp built in, but that requires compilation with -mavx (or a comparable flag)
-      foreach(_flag "-xAVX" "-mavx" "/arch:AVX")
-         AddCompilerFlag("${_flag}" CXX_RESULT _flag_works)
-         if(_flag_works)
-            if(_flag STREQUAL "-xAVX")
-               set(_flag "${_flag} -diag-disable 10121") # disable the warning "overriding -xSSE4.2 with -xAVX"
-            endif()
-            list(APPEND _srcs src/avx_sorthelper.cpp)
-            set_source_files_properties(src/avx_sorthelper.cpp PROPERTIES COMPILE_FLAGS "${_flag}")
-            break()
-         endif()
-      endforeach()
-   endif()
-endif()
+vc_compile_for_all_implementations(_objs1 src/avx_sorthelper.cpp FLAGS ${libvc_compile_flags} ONLY AVX)
+set(_srcs src/const.cpp src/cpuid.cpp src/support.cpp ${_objs0} ${_objs1})
 add_library(Vc STATIC ${_srcs})
-add_target_property(Vc COMPILE_FLAGS ${libvc_compile_flags})
+add_target_property(Vc COMPILE_FLAGS "${libvc_compile_flags} ${Vc_DEFINITIONS}")
 
 # vim: ft=cmake sw=3 et