Skip to content
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

VecMem (and CMake) Update, main branch (2024.04.11.) #114

Merged
merged 1 commit into from
Apr 12, 2024
Merged

VecMem (and CMake) Update, main branch (2024.04.11.) #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 10 additions & 18 deletions cmake/algebra-plugins-compiler-options-sycl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,29 @@
# Algebra plugins library, part of the ACTS project (R&D line)
#
# (c) 2021-2023 CERN for the benefit of the ACTS project
# (c) 2021-2024 CERN for the benefit of the ACTS project
#
# Mozilla Public License Version 2.0

# Include the helper function(s).
include( algebra-plugins-functions )

# Basic flags for all build modes.
foreach( mode RELEASE RELWITHDEBINFO MINSIZEREL DEBUG )
algebra_add_flag( CMAKE_SYCL_FLAGS_${mode} "-Wall" )
algebra_add_flag( CMAKE_SYCL_FLAGS_${mode} "-Wextra" )
algebra_add_flag( CMAKE_SYCL_FLAGS_${mode} "-Wno-unknown-cuda-version" )
algebra_add_flag( CMAKE_SYCL_FLAGS_${mode} "-Wshadow" )
algebra_add_flag( CMAKE_SYCL_FLAGS_${mode} "-Wunused-local-typedefs" )
endforeach()
algebra_add_flag( CMAKE_SYCL_FLAGS "-Wall" )
algebra_add_flag( CMAKE_SYCL_FLAGS "-Wextra" )
algebra_add_flag( CMAKE_SYCL_FLAGS "-Wno-unknown-cuda-version" )
algebra_add_flag( CMAKE_SYCL_FLAGS "-Wshadow" )
algebra_add_flag( CMAKE_SYCL_FLAGS "-Wunused-local-typedefs" )
if( NOT WIN32 )
foreach( mode RELEASE RELWITHDEBINFO MINSIZEREL DEBUG )
algebra_add_flag( CMAKE_SYCL_FLAGS_${mode} "-pedantic" )
endforeach()
algebra_add_flag( CMAKE_SYCL_FLAGS "-pedantic" )
endif()

# Avoid issues coming from MSVC<->DPC++ argument differences.
if( "${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC" )
foreach( mode RELEASE RELWITHDEBINFO MINSIZEREL DEBUG )
algebra_add_flag( CMAKE_SYCL_FLAGS_${mode}
"-Wno-unused-command-line-argument" )
endforeach()
algebra_add_flag( CMAKE_SYCL_FLAGS
"-Wno-unused-command-line-argument" )
endif()

# Fail on warnings, if asked for that behaviour.
if( ALGEBRA_PLUGINS_FAIL_ON_WARNINGS )
foreach( mode RELEASE RELWITHDEBINFO MINSIZEREL DEBUG )
algebra_add_flag( CMAKE_SYCL_FLAGS_${mode} "-Werror" )
endforeach()
algebra_add_flag( CMAKE_SYCL_FLAGS "-Werror" )
endif()
4 changes: 2 additions & 2 deletions extern/vecmem/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Algebra plugins library, part of the ACTS project (R&D line)
#
# (c) 2021-2023 CERN for the benefit of the ACTS project
# (c) 2021-2024 CERN for the benefit of the ACTS project
#
# Mozilla Public License Version 2.0

Expand All @@ -13,7 +13,7 @@ message( STATUS "Building VecMem as part of the Algebra Plugins project" )

# Declare where to get VecMem from.
set( ALGEBRA_PLUGINS_VECMEM_SOURCE
"URL;https://github.com/acts-project/vecmem/archive/refs/tags/v0.27.0.tar.gz;URL_MD5;cd1520efbd46d5d09ac5727452939ede"
"URL;https://github.com/acts-project/vecmem/archive/refs/tags/v1.5.0.tar.gz;URL_MD5;3cc5a3bb14b93f611513535173a6be28"
CACHE STRING "Source for VecMem, when built as part of this project" )
mark_as_advanced( ALGEBRA_PLUGINS_VECMEM_SOURCE )
FetchContent_Declare( VecMem ${ALGEBRA_PLUGINS_VECMEM_SOURCE} )
Expand Down
Loading