From 37eef76614380ec11cada18809daeaeca58b1e1d Mon Sep 17 00:00:00 2001 From: mkretz Date: Fri, 8 Nov 2013 16:42:16 +0000 Subject: [PATCH] fix libVc compilation 1. trigonometric.cpp got lost with my last commit 2. Vc_DEFINITIONS is already added by the vc_compiler_for_all_implementations macro, therefore removed it from libvc_compile_flags 3. proper use of add_target_property requires quotation marks --- Vc/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Vc/CMakeLists.txt b/Vc/CMakeLists.txt index 8e1fce07436..d51cf454c90 100644 --- a/Vc/CMakeLists.txt +++ b/Vc/CMakeLists.txt @@ -3,12 +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) -vc_compile_for_all_implementations(_objs src/avx_sorthelper.cpp FLAGS ${libvc_compile_flags} ONLY AVX) -set(_srcs src/const.cpp src/cpuid.cpp src/support.cpp ${_objs}) +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 -- 2.43.0