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 15 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
15 commits
Select commit Hold shift + click to select a range
c2460c4
[math][genvector] remove leftover Makefile
ferdymercury Apr 7, 2026
2644907
[mathcore] remove leftover Makefile
ferdymercury Apr 7, 2026
984910c
[math] rescue smatrix test by migrating to CMake
ferdymercury Apr 7, 2026
ed0a9f4
[tests] fix warnings
ferdymercury Apr 8, 2026
4229684
[test] fix compilation error due to max template depth reached
ferdymercury Apr 8, 2026
19a816c
[test] disable smatrix reflex test
ferdymercury Apr 8, 2026
fe7101c
[test] no runtime loading of track lib dictionary
ferdymercury Apr 8, 2026
4823286
[test] fix uninitialized warning
ferdymercury Apr 12, 2026
5ce524b
Apply suggestions from code review
ferdymercury Apr 12, 2026
08946a8
Correctly link CLHEP library when CLHEPBASE shell variable exists
linev Apr 14, 2026
06a8aea
[math] rescue reflex use
ferdymercury Apr 14, 2026
ac1f8ee
[test] rescue reflex_use
ferdymercury Apr 14, 2026
77b3f6c
[genvector] rescue test with dict from Makefile
ferdymercury Apr 14, 2026
47fa95c
[cmake] disambiguate
ferdymercury Apr 14, 2026
5fd8c35
Apply suggestion from @ferdymercury
ferdymercury Apr 14, 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
13 changes: 13 additions & 0 deletions math/genvector/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,19 @@ ROOT_EXECUTABLE(testVectorIO testVectorIO.cxx LIBRARIES GenVector Tree Hist Gpad
ROOT_ADD_TEST(test-genvector-vectorio COMMAND testVectorIO
COPY_TO_BUILDDIR ${CMAKE_CURRENT_SOURCE_DIR}/Track.h)

if (DEFINED ENV{USE_REFLEX})
REFLEX_GENERATE_DICTIONARY(GVTrackDict Track.h SELECTION TrackDict.xml)
else()
ROOT_GENERATE_DICTIONARY(GVTrackDict Track.h LINKDEF TrackLinkDef.h OPTIONS -inlineInputHeader)
endif()
Comment on lines +22 to +26
Copy link
Copy Markdown
Member

@pcanal pcanal Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would either drop one or always run both.

Suggested change
if (DEFINED ENV{USE_REFLEX})
REFLEX_GENERATE_DICTIONARY(GVTrackDict Track.h SELECTION TrackDict.xml)
else()
ROOT_GENERATE_DICTIONARY(GVTrackDict Track.h LINKDEF TrackLinkDef.h OPTIONS -inlineInputHeader)
endif()
REFLEX_GENERATE_DICTIONARY(GVTrackDictXml Track.h SELECTION TrackDict.xml)
ROOT_GENERATE_DICTIONARY(GVTrackDict Track.h LINKDEF TrackLinkDef.h OPTIONS -inlineInputHeader)

and also duplicate the test accordingly.

ROOT_EXECUTABLE(testVectorIOdict testVectorIO.cxx GVTrackDict.cxx LIBRARIES GenVector Tree Hist Gpad Physics)
target_include_directories(testVectorIOdict PRIVATE ./)
if (DEFINED ENV{USE_REFLEX})
target_compile_definitions(testVectorIOdict PRIVATE USE_REFLEX)
endif()
ROOT_ADD_TEST(test-genvector-vectoriodict COMMAND testVectorIOdict
COPY_TO_BUILDDIR ${CMAKE_CURRENT_SOURCE_DIR}/Track.h)

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