Skip to content

Update Vc version to 1.3.2 and suppress warnings by including it as a system header #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amadio merged 2 commits into from
Jun 6, 2017
Merged

Update Vc version to 1.3.2 and suppress warnings by including it as a system header #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1311228
Bump version of Vc to 1.3.2
amadio Jun 6, 2017
ba13271
Suppress Vc warnings in ROOT build
amadio Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/modules/SearchInstalledSoftware.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
6 changes: 3 additions & 3 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand All @@ -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)
Expand Down