update to Vc 0.7.3-dev

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

diff --git a/Vc/CMakeLists.txt b/Vc/CMakeLists.txt
index 483f66a4b51dd1df407cfe8d4fc406333698c5d2..d9b74de39dc11bb8fe9b23002f27e6ab0c12186f 100644 (file)
--- a/Vc/CMakeLists.txt
+++ b/Vc/CMakeLists.txt
@@ -1,37 +1,31 @@
-macro(vc_add_target_property _target _prop _value)
-   get_target_property(_oldprop "${_target}" ${_prop})
-   if(NOT _oldprop)
-      set_target_properties("${_target}" PROPERTIES ${_prop} "${_value}")
-   else(NOT _oldprop)
-      set_target_properties("${_target}" PROPERTIES ${_prop} "${_oldprop} ${_value}")
-   endif(NOT _oldprop)
-endmacro()
+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}
+      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)
-   add_library(Vc STATIC src/vector.cpp src/cpuid.cpp src/support.cpp src/avx/sorthelper.cpp)
+   list(APPEND _srcs src/avx_sorthelper.cpp)
 else()
-   set(_srcs src/vector.cpp src/cpuid.cpp src/support.cpp)
-
    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")
-         check_cxx_compiler_flag("${_flag}" check_cxx_compiler_flag_${_flag})
-         if(check_cxx_compiler_flag_${_flag})
+      # 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()
-            set(_srcs ${_srcs} src/avx/sorthelper.cpp)
-            set_source_files_properties(src/avx/sorthelper.cpp PROPERTIES COMPILE_FLAGS "${_flag}")
+            list(APPEND _srcs src/avx_sorthelper.cpp)
+            set_source_files_properties(src/avx_sorthelper.cpp PROPERTIES COMPILE_FLAGS "${_flag}")
             break()
          endif()
       endforeach()
    endif()
-   add_library(Vc STATIC ${_srcs})
 endif()
-string(REPLACE "-Weffc++" "" CXXFLAGS "${CXXFLAGS}")
-vc_add_target_property(Vc COMPILE_FLAGS "-DVC_COMPILE_LIB ${CXXFLAGS} -O3 ${Vc_DEFINITIONS}")
-vc_add_target_property(Vc LABELS "other")
+add_library(Vc STATIC ${_srcs})
+add_target_property(Vc COMPILE_FLAGS ${libvc_compile_flags})
 
 # vim: ft=cmake sw=3 et