Skip to content

[roottest] fix typo in variable name #22031

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

Merged
dpiparo merged 1 commit into from
Apr 24, 2026
+1 −1
Merged

[roottest] fix typo in variable name #22031

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2749,7 +2749,7 @@ macro(ROOTTEST_GENERATE_REFLEX_DICTIONARY dictionary)
set(CMAKE_ROOTTEST_NOROOTMAP OFF)
endif()
set(ROOT_genreflex_cmd ${ROOT_BINDIR}/genreflex)
set(ROOT_genreflex_CMD ${ROOT_BINDIR}/genreflex)
Copy link
Copy Markdown
Member

@pcanal pcanal Apr 23, 2026

Choose a reason for hiding this comment

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

Note we should probably see if we can now remove the duplicate (former main) settings:

roottest/CMakeLists.txt:  set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex.exe CACHE INTERNAL "ROOTTEST variable for genreflex executable")

roottest/CMakeLists.txt:  set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex CACHE INTERNAL "ROOTTEST variable for genreflex executable")

Copy link
Copy Markdown
Collaborator Author

@ferdymercury ferdymercury Apr 23, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

They are used for different things, so not easily:

  • A: one is for macros, only used when you call REFLEX_GENERATE_DICTIONARY or, from within roottest, when you call ROOTTEST_GENERATE_REFLEX_DICTIONARY. This variant uses ROOT_BIN_DIR
  • B: the other one is for manual commands within roottests such as COMMAND ${ROOT_genreflex_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/abc.h -o. This variant uses ROOTSYS.

So two questions:

  • should there be an if-else in version A) so that it resolves to genreflex.exe in Windows? Or maybe something more modern like using $<TARGET_FILE:tgt> ?
  • should we replace
    ROOTTEST_ADD_TEST(5594 COMMAND ${ROOT_genreflex_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/AliAODPid.h -o AliAODPid.cxx --select=${CMAKE_CURRENT_SOURCE_DIR}/AliAODPid_selection.xml)
    with sth like:
    ROOTTEST_GENERATE_REFLEX_DICTIONARY(AliAODPid.h SELECTION AliAODPid_selection.xml)
    to avoid those duplicities of the CMD definition?

Maybe in a follow-up PR ?

Tagging also @guitargeek since he has dealt with ROOTSYS removal.

Copy link
Copy Markdown
Collaborator Author

@ferdymercury ferdymercury Apr 23, 2026

Choose a reason for hiding this comment

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

alternative approach: #22034

ROOTSYS part: #22032

ROOTTEST_TARGETNAME_FROM_FILE(targetname ${dictionary})
Expand Down
Loading