From 13112283e8afb101ae5a9aab1f909c373a628444 Mon Sep 17 00:00:00 2001 From: Guilherme Amadio Date: Tue, 6 Jun 2017 11:36:16 +0200 Subject: [PATCH 1/2] Bump version of Vc to 1.3.2 --- cmake/modules/SearchInstalledSoftware.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake index aaa8a1b325fe8..1b8572b6ca029 100644 --- a/cmake/modules/SearchInstalledSoftware.cmake +++ b/cmake/modules/SearchInstalledSoftware.cmake @@ -1303,10 +1303,10 @@ elseif(vc) endif() if(vc AND NOT Vc_FOUND AND NOT (veccore OR builtin_veccore)) - set(Vc_VERSION "1.3.0") + set(Vc_VERSION "1.3.2") set(Vc_PROJECT "Vc-${Vc_VERSION}") set(Vc_SRC_URI "${lcgpackages}/${Vc_PROJECT}.tar.gz") - set(Vc_SRC_MD5 "a248e904f0b1a330ad8f37ec50cbad30") + set(Vc_SRC_MD5 "f996a2dcab9f0ef3e21ba0d0feba9c3e") set(Vc_DESTDIR "${CMAKE_BINARY_DIR}/VC-prefix/install") set(Vc_ROOTDIR "${Vc_DESTDIR}/${CMAKE_INSTALL_PREFIX}") set(Vc_LIBNAME "${CMAKE_STATIC_LIBRARY_PREFIX}Vc${CMAKE_STATIC_LIBRARY_SUFFIX}") From ba13271a6b397e0b59a3d17e636062d63cdbfb6c Mon Sep 17 00:00:00 2001 From: Guilherme Amadio Date: Tue, 6 Jun 2017 11:43:38 +0200 Subject: [PATCH 2/2] Suppress Vc warnings in ROOT build --- test/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index cac7860ef7e7d..d1feeb09b628f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -299,7 +299,7 @@ endif() #--Vc basic test----------------------------------------------------------------------------------- if(ROOT_vc_FOUND) - include_directories(${Vc_INCLUDE_DIRS}) + include_directories(SYSTEM BEFORE ${Vc_INCLUDE_DIRS}) ROOT_ADD_CXX_FLAG(vc_flags -Wno-unused-parameter) ROOT_ADD_CXX_FLAG(vc_flags -Wno-missing-braces) @@ -315,7 +315,7 @@ endif() if(ROOT_veccore_FOUND) ROOT_EXECUTABLE(test-veccore test-veccore.cxx LIBRARIES ${VecCore_LIBRARIES} BUILTINS VECCORE) target_compile_definitions(test-veccore PRIVATE ${VecCore_DEFINITIONS}) - target_include_directories(test-veccore PRIVATE ${VecCore_INCLUDE_DIRS}) + target_include_directories(test-veccore SYSTEM BEFORE PRIVATE ${VecCore_INCLUDE_DIRS}) if(VecCore_Vc_FOUND) ROOT_ADD_TEST(VecCore COMMAND test-veccore REGEX "Vc") else() @@ -325,7 +325,7 @@ endif() #--Vc GenVector test----------------------------------------------------------------------------------- if(ROOT_vc_FOUND) - include_directories(${Vc_INCLUDE_DIRS}) + include_directories(SYSTEM BEFORE ${Vc_INCLUDE_DIRS}) ROOT_ADD_CXX_FLAG(vc_flags -Wno-unused-parameter) ROOT_ADD_CXX_FLAG(vc_flags -Wno-missing-braces)