From 139b3e9878dceb334ee2fb8c0126fbbf5595e94a Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 23 Apr 2026 18:49:32 +0200 Subject: [PATCH 1/3] [cmake] fix variable name typo --- cmake/modules/RootMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake index 3365f45ff0158..773561f83d38f 100644 --- a/cmake/modules/RootMacros.cmake +++ b/cmake/modules/RootMacros.cmake @@ -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) ROOTTEST_TARGETNAME_FROM_FILE(targetname ${dictionary}) From 92436a7e4fa8fa614de8b4cec653a281e48050f3 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 23 Apr 2026 18:50:34 +0200 Subject: [PATCH 2/3] [cmake] move to local scope where actually used and prevent error when directly calling REFLEX_GENERATE_DICTIONARY --- cmake/modules/RootMacros.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake index 773561f83d38f..dd06c4c3222a2 100644 --- a/cmake/modules/RootMacros.cmake +++ b/cmake/modules/RootMacros.cmake @@ -198,6 +198,7 @@ function(REFLEX_GENERATE_DICTIONARY dictionary) LIST(APPEND definitions "$,EXCLUDE,^$>") ENDIF() + set(ROOT_genreflex_CMD ${ROOT_BINDIR}/genreflex) add_custom_command( OUTPUT ${gensrcdict} ${rootmapname} COMMAND ${ROOT_genreflex_CMD} @@ -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) From be386308d74d6bf5cfe8cd928f66e90151e75193 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 23 Apr 2026 18:53:22 +0200 Subject: [PATCH 3/3] [cmake] avoid OS-branching and uniformize --- cmake/modules/RootMacros.cmake | 2 +- roottest/CMakeLists.txt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake index dd06c4c3222a2..e854bc9d2a4a3 100644 --- a/cmake/modules/RootMacros.cmake +++ b/cmake/modules/RootMacros.cmake @@ -198,7 +198,7 @@ function(REFLEX_GENERATE_DICTIONARY dictionary) LIST(APPEND definitions "$,EXCLUDE,^$>") ENDIF() - set(ROOT_genreflex_CMD ${ROOT_BINDIR}/genreflex) + set(ROOT_genreflex_CMD $) add_custom_command( OUTPUT ${gensrcdict} ${rootmapname} COMMAND ${ROOT_genreflex_CMD} diff --git a/roottest/CMakeLists.txt b/roottest/CMakeLists.txt index 7b290c389767d..4de77835a8e4d 100644 --- a/roottest/CMakeLists.txt +++ b/roottest/CMakeLists.txt @@ -21,7 +21,7 @@ if(MSVC) set(WILLFAIL_ON_WIN32 WILLFAIL) endif() - # ROOT_BINDIR is set by ROOTConfig.cmake + # ROOT_BINDIR is set by ROOTConfiguration.cmake set(ROOT_CONFIG_EXECUTABLE ${ROOT_BINDIR}/root-config.bat) execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE) cmake_path(CONVERT "${ROOTSYS}" TO_CMAKE_PATH_LIST ROOTSYS) @@ -30,7 +30,6 @@ if(MSVC) cmake_path(CONVERT "${ROOT_TUTORIALS_DIR}" TO_CMAKE_PATH_LIST ROOT_TUTORIALS_DIR) set(ROOT_root_CMD ${ROOTSYS}/bin/root.exe) set(ROOT_hadd_CMD ${ROOTSYS}/bin/hadd.exe) - set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex.exe) set(ROOT_rootcint_CMD ${ROOTSYS}/bin/rootcint.exe) set(ROOT_rootcling_CMD ${ROOTSYS}/bin/rootcling.exe) if(CMAKE_GENERATOR MATCHES Ninja) @@ -60,10 +59,10 @@ else() set(ROOT_LIBRARIES Core RIO Net Hist Gpad Tree Rint Matrix MathCore) set(ROOT_root_CMD ${ROOTSYS}/bin/root.exe) set(ROOT_hadd_CMD ${ROOTSYS}/bin/hadd) - set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex) set(ROOT_rootcint_CMD ${ROOTSYS}/bin/rootcint) set(ROOT_rootcling_CMD rootcling) endif() +set(ROOT_genreflex_CMD $) get_filename_component(ROOT_LIBRARY_DIR "${ROOTSYS}/lib" ABSOLUTE)