Skip to content

Commit dad014d

Browse files
committed
[Minuit2] Correctly copy ROOT's std::span headers for standalone build
Correctly copy ROOT's `std::span` headers to setup the Minuit2 standalone build. Now the treatment of the `std::span` headers follows the same approach that is already taken for other headers that are copied from ROOT Math: See https://github.com/root-project/root/blob/master/math/minuit2/src/math/CMakeLists.txt#L36 See https://github.com/root-project/root/blob/master/math/minuit2/src/math/CMakeLists.txt#L97 Closes #18974.
1 parent 9a4565f commit dad014d

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

math/minuit2/StandAlone.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,10 @@ include(copy_standalone.cmake)
4242
# We need the std::span backport. This can be removed once the minimum C++
4343
# standard gets raised to C++20, which should happen if also the minimum C++
4444
# standard of ROOT gets raised and the std::span backport in RSpan is removed.
45-
include_directories(../../core/foundation/inc/)
4645
set(SPAN_HEADERS RSpan.hxx span.hxx)
47-
copy_standalone(SOURCE ../../core/foundation/inc/ROOT DESTINATION . OUTPUT SPAN_HEADERS
46+
copy_standalone(SOURCE ../../core/foundation/inc/ROOT DESTINATION inc/ROOT OUTPUT SPAN_HEADERS
4847
FILES ${SPAN_HEADERS})
49-
install(FILES ${SPAN_HEADERS} DESTINATION include/ROOT)
48+
install(FILES ${SPAN_HEADERS} DESTINATION include/Minuit2/ROOT)
5049

5150

5251
# Copy these files in if needed

0 commit comments

Comments
 (0)