Skip to content

Commit eb27813

Browse files
authored
Merge pull request #945 from acts-project/build/remove_dfelibs
Remove dependency on dfelibs
2 parents c4b3265 + 3c66b89 commit eb27813

12 files changed

+447
-97
lines changed

CMakeLists.txt

-15
Original file line numberDiff line numberDiff line change
@@ -225,21 +225,6 @@ if(DETRAY_SETUP_NLOHMANN)
225225
endif()
226226
endif()
227227

228-
# Set up dfelibs.
229-
option(DETRAY_SETUP_DFELIBS "Set up the dfelibs target(s) explicitly" TRUE)
230-
option(
231-
DETRAY_USE_SYSTEM_DFELIBS
232-
"Pick up an existing installation of dfelibs from the build environment"
233-
${DETRAY_USE_SYSTEM_LIBS}
234-
)
235-
if(DETRAY_SETUP_DFELIBS)
236-
if(DETRAY_USE_SYSTEM_DFELIBS)
237-
find_package(dfelibs REQUIRED)
238-
else()
239-
add_subdirectory(extern/dfelibs)
240-
endif()
241-
endif()
242-
243228
# Set up GoogleTest.
244229
option(
245230
DETRAY_SETUP_GOOGLETEST

CMakePresets.json

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"DETRAY_SETUP_ACTSVG": "TRUE",
3737
"DETRAY_SETUP_BENCHMARK": "TRUE",
3838
"DETRAY_SETUP_COVFIE": "TRUE",
39-
"DETRAY_SETUP_DFELIBS": "TRUE",
4039
"DETRAY_SETUP_NLOHMANN": "TRUE",
4140
"ALGEBRA_PLUGINS_INCLUDE_EIGEN": "TRUE",
4241
"ALGEBRA_PLUGINS_SETUP_EIGEN3": "TRUE",

cmake/detray-config.cmake.in

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ include( CMakeFindDependencyMacro )
2626
find_dependency( algebra-plugins )
2727
find_dependency( covfie )
2828
find_dependency( vecmem )
29-
find_dependency( dfelibs )
3029
find_dependency( nlohmann_json )
3130
if( DETRAY_DISPLAY )
3231
find_dependency( actsvg )

extern/dfelibs/CMakeLists.txt

-55
This file was deleted.

extern/dfelibs/README.md

-4
This file was deleted.

io/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ file(
8383
detray_add_library( detray_csv_io csv_io
8484
${_detray_csv_io_public_headers}
8585
)
86-
target_link_libraries(detray_csv_io INTERFACE dfelibs::dfelibs detray::io_utils)
86+
target_link_libraries(detray_csv_io INTERFACE detray::io_utils)
8787

8888
# Test the public headers of the detray I/O libraries.
8989
if(BUILD_TESTING AND DETRAY_BUILD_TESTING)

0 commit comments

Comments
 (0)