Skip to content

[build] Align SDK path seen by rootcling with CMake #21390

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
vepadulano merged 1 commit into from
Feb 26, 2026
+20 −4
Merged

[build] Align SDK path seen by rootcling with CMake #21390

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
24 changes: 20 additions & 4 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,22 +626,38 @@ function(ROOT_GENERATE_DICTIONARY dictionary)

#---what rootcling command to use--------------------------
if(ARG_STAGE1)
set(command $<TARGET_FILE:rootcling_stage1>)
if(APPLE)
set(command ${CMAKE_COMMAND} -E env SDKROOT=${CMAKE_OSX_SYSROOT} $<TARGET_FILE:rootcling_stage1>)
else()
set(command $<TARGET_FILE:rootcling_stage1>)
endif()
set(ROOTCLINGDEP rconfigure)
set(pcm_name)
else()
if(CMAKE_PROJECT_NAME STREQUAL ROOT)
if(MSVC AND CMAKE_ROOTTEST_DICT)
set(command ${CMAKE_COMMAND} -E env "ROOTIGNOREPREFIX=1" ${CMAKE_BINARY_DIR}/bin/rootcling.exe -rootbuild)
else()
set(command ${CMAKE_COMMAND} -E env "ROOTIGNOREPREFIX=1" $<TARGET_FILE:rootcling> -rootbuild)
if(APPLE)
set(command ${CMAKE_COMMAND} -E env "ROOTIGNOREPREFIX=1" SDKROOT=${CMAKE_OSX_SYSROOT} $<TARGET_FILE:rootcling> -rootbuild)
else()
set(command ${CMAKE_COMMAND} -E env "ROOTIGNOREPREFIX=1" $<TARGET_FILE:rootcling> -rootbuild)
endif()
# Modules need RConfigure.h copied into include/.
set(ROOTCLINGDEP rootcling rconfigure)
endif()
elseif(TARGET ROOT::rootcling)
set(command $<TARGET_FILE:ROOT::rootcling>)
if(APPLE)
set(command ${CMAKE_COMMAND} -E env SDKROOT=${CMAKE_OSX_SYSROOT} $<TARGET_FILE:ROOT::rootcling>)
else()
set(command $<TARGET_FILE:ROOT::rootcling>)
endif()
else()
set(command rootcling)
if(APPLE)
set(command ${CMAKE_COMMAND} -E env SDKROOT=${CMAKE_OSX_SYSROOT} rootcling)
else()
set(command rootcling)
endif()
endif()
endif()

Expand Down
Loading