Skip to content

[math] migrate old Makefiles to CMake and reenable non-covered tests #21890

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

Open
ferdymercury wants to merge 21 commits into
base: master
Choose a base branch
from
Open

[math] migrate old Makefiles to CMake and reenable non-covered tests #21890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7c07290
[math][genvector] remove leftover Makefile
ferdymercury Apr 7, 2026
63f44c6
[mathcore] remove leftover Makefile
ferdymercury Apr 7, 2026
5d47b4f
[math] rescue smatrix test by migrating to CMake
ferdymercury Apr 7, 2026
72d8a10
[tests] fix warnings
ferdymercury Apr 8, 2026
7d1cf0a
[test] fix compilation error due to max template depth reached
ferdymercury Apr 8, 2026
f728fd6
[test] disable smatrix reflex test
ferdymercury Apr 8, 2026
e8b9adb
[test] no runtime loading of track lib dictionary
ferdymercury Apr 8, 2026
ad2a794
[test] fix uninitialized warning
ferdymercury Apr 12, 2026
3938b57
Correctly link CLHEP library when CLHEPBASE shell variable exists
linev Apr 14, 2026
b7eae1f
[math] rescue reflex use
ferdymercury Apr 14, 2026
b42942c
[genvector] rescue test with dict from Makefile
ferdymercury Apr 14, 2026
76229c3
[cmake] disambiguate
ferdymercury Apr 14, 2026
88bcc41
test variants
ferdymercury Apr 15, 2026
95d73a2
[test] fix duplicated stuff and copy-to-builds
ferdymercury Apr 23, 2026
5ed3df4
letters
ferdymercury Apr 23, 2026
de5fd17
test read kalman
ferdymercury Apr 23, 2026
b1d3d08
swap
ferdymercury Apr 23, 2026
c1a3ef5
fix empty genreflex command
ferdymercury Apr 23, 2026
4a0cbb3
fix buffer overflow
ferdymercury Apr 23, 2026
cf1f5fb
fix indices and read testOp
ferdymercury Apr 23, 2026
b46c773
try fix concurrency issue
ferdymercury Apr 23, 2026
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
5 changes: 2 additions & 3 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,14 @@ function(REFLEX_GENERATE_DICTIONARY dictionary)
LIST(APPEND definitions "$<FILTER:$<TARGET_PROPERTY:${dictionary},COMPILE_DEFINITIONS>,EXCLUDE,^$>")
ENDIF()

set(ROOT_genreflex_CMD $<TARGET_FILE:genreflex>)
add_custom_command(
OUTPUT ${gensrcdict} ${rootmapname}
COMMAND ${ROOT_genreflex_CMD}
ARGS ${headerfiles} -o ${gensrcdict} ${rootmapopts} --select=${selectionfile}
${ARG_OPTIONS}
"-I$<JOIN:$<REMOVE_DUPLICATES:$<FILTER:${include_dirs},EXCLUDE,^$>>,;-I>"
"$<$<BOOL:$<JOIN:${definitions},>>:-D$<JOIN:${definitions},;-D>>"
OUTPUT ${gensrcdict} ${rootmapname}
DEPENDS ${headerfiles} ${selectionfile} ${ARG_DEPENDS}

COMMAND_EXPAND_LISTS
Expand Down Expand Up @@ -2749,8 +2750,6 @@ macro(ROOTTEST_GENERATE_REFLEX_DICTIONARY dictionary)
set(CMAKE_ROOTTEST_NOROOTMAP OFF)
endif()

set(ROOT_genreflex_CMD ${ROOT_BINDIR}/genreflex)

ROOTTEST_TARGETNAME_FROM_FILE(targetname ${dictionary})

set(targetname_libgen ${targetname}-libgen)
Expand Down
16 changes: 15 additions & 1 deletion math/genvector/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,22 @@ ROOT_EXECUTABLE(testGenvector testGenVector.cxx LIBRARIES GenVector Hist Smatrix
ROOT_ADD_TEST(test-genvector-genvector COMMAND testGenvector)

ROOT_EXECUTABLE(testVectorIO testVectorIO.cxx LIBRARIES GenVector Tree Hist Gpad Physics)
target_include_directories(testVectorIO PRIVATE ./)
ROOT_ADD_TEST(test-genvector-vectorio COMMAND testVectorIO
COPY_TO_BUILDDIR ${CMAKE_CURRENT_SOURCE_DIR}/Track.h)
COPY_TO_BUILDDIR ${CMAKE_CURRENT_SOURCE_DIR}/Track.h
FIXTURES_SETUP vectoriofixture)

ROOT_GENERATE_DICTIONARY(GVTrackDict Track.h LINKDEF TrackLinkDef.h OPTIONS -inlineInputHeader)
ROOT_EXECUTABLE(testVectorIOdict testVectorIO.cxx GVTrackDict.cxx LIBRARIES GenVector Tree Hist Gpad Physics)
Comment thread
ferdymercury marked this conversation as resolved.
Comment thread
ferdymercury marked this conversation as resolved.
REFLEX_GENERATE_DICTIONARY(GVTrackDictXml Track.h SELECTION TrackDict.xml)
ROOT_EXECUTABLE(testVectorIOdictXml testVectorIO.cxx GVTrackDictXml.cxx LIBRARIES GenVector Tree Hist Gpad Physics)
target_include_directories(testVectorIOdict PRIVATE ./)
target_include_directories(testVectorIOdictXml PRIVATE ./)
target_compile_definitions(testVectorIOdictXml PRIVATE USE_REFLEX)
ROOT_ADD_TEST(test-genvector-vectoriodict COMMAND testVectorIOdict
FIXTURES_REQUIRED vectoriofixture FIXTURES_SETUP vectoriodictrun)
ROOT_ADD_TEST(test-genvector-vectoriodictxml COMMAND testVectorIOdictXml
FIXTURES_REQUIRED vectoriodictrun)

ROOT_EXECUTABLE(coordinates3D coordinates3D.cxx LIBRARIES GenVector)
ROOT_ADD_TEST(test-genvector-coordinates3D COMMAND coordinates3D)
Expand Down
207 changes: 0 additions & 207 deletions math/genvector/test/Makefile
View file
Open in desktop

This file was deleted.

114 changes: 0 additions & 114 deletions math/mathcore/test/fit/Makefile
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions math/smatrix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ ROOT_GENERATE_DICTIONARY(G__Smatrix32
Core
MathCore
)

ROOT_ADD_TEST_SUBDIRECTORY(test)
Loading
Loading