Skip to content

Commit e0d94e5

Browse files
Merge branch 'main' into MG_updateDeps_260506
2 parents c97ab89 + b39d970 commit e0d94e5

6 files changed

Lines changed: 15 additions & 11 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,9 +607,9 @@ if(ACTS_SETUP_VECMEM)
607607
find_package(vecmem ${_acts_vecmem_version} REQUIRED)
608608
else()
609609
add_subdirectory(thirdparty/vecmem)
610-
# Make the "VecMem language code" available for the whole project.
611-
include("${VECMEM_LANGUAGE_DIR}/vecmem-check-language.cmake")
612610
endif()
611+
# Make the "VecMem language code" available for the whole project.
612+
list(APPEND CMAKE_MODULE_PATH "${VECMEM_LANGUAGE_DIR}")
613613
endif()
614614

615615
if(ACTS_SETUP_COVFIE)

CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
# owners of code they work on. We encourage contributors to take ownership of
2626
# code, but only on a voluntary basis.
2727

28+
**/*GlobalChiSquareFitter* @AJPfleger
29+
**/*gx2f* @AJPfleger
30+
**/*Gx2f* @AJPfleger
31+
**/*requirements* @AJPfleger
32+
CI/check_unused_files.py @AJPfleger
2833
Detray/** @niermann999
2934
Plugins/Covfie/** @stephenswat
3035
Plugins/Detray/** @niermann999

Detray/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,11 @@ if(DETRAY_SETUP_VECMEM)
246246
find_package(vecmem ${DETRAY_VECMEM_VERSION} REQUIRED)
247247
else()
248248
add_subdirectory(extern/vecmem)
249-
# Make the "VecMem language code" available for the whole project.
250-
include("${VECMEM_LANGUAGE_DIR}/vecmem-check-language.cmake")
251249
endif()
250+
# Make the "VecMem language code" available for the whole project.
251+
list(APPEND CMAKE_MODULE_PATH "${VECMEM_LANGUAGE_DIR}")
252252
endif()
253253

254-
include(vecmem-check-language)
255-
256254
# Set up JSON for I/O
257255
option(
258256
DETRAY_SETUP_NLOHMANN

Detray/tests/include/detray/test/device/sycl/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
message(STATUS "Building 'detray::test_sycl' component")
1010

1111
# Enable SYCL as a language.
12+
include(vecmem-check-language) # Needed for the SYCL language.
1213
enable_language(SYCL)
1314

1415
# Set the default SYCL compiler flags.

Detray/tests/integration_tests/device/sycl/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88

99
message(STATUS "Building detray SYCL integration tests")
1010

11-
# Set the SYCL build flags.
12-
include(detray-compiler-options-sycl)
13-
1411
# Enable SYCL as a language.
12+
include(vecmem-check-language) # Needed for the SYCL language.
1513
enable_language(SYCL)
1614

15+
# Set the SYCL build flags.
16+
include(detray-compiler-options-sycl)
17+
1718
# make unit tests for multiple algebras
1819
# Currently eigen, vc and smatrix is not supported
1920
set(algebras "array")

Detray/tests/unit_tests/device/sycl/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
message(STATUS "Building detray SYCL unit tests")
1010

1111
# Enable SYCL as a language.
12-
vecmem_check_language( SYCL )
13-
12+
include(vecmem-check-language) # Needed for the SYCL language.
1413
enable_language(SYCL)
1514

1615
# Set the default SYCL compiler flags.

0 commit comments

Comments
 (0)