Skip to content

Tests: add DEFAULT_ROOT_INCLUDE_PATH where needed #20115

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
merged 1 commit into from
Oct 16, 2025
+3 −3
Merged

Tests: add DEFAULT_ROOT_INCLUDE_PATH where needed #20115

Show file tree
Hide file tree
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 @@ -2370,7 +2370,7 @@ macro(ROOTTEST_COMPILE_MACRO filename)

set(root_compile_macro ${CMAKE_COMMAND} -E env
ROOT_LIBRARY_PATH="${CMAKE_CURRENT_BINARY_DIR}"
ROOT_INCLUDE_PATH="${CMAKE_CURRENT_BINARY_DIR}"
ROOT_INCLUDE_PATH="${CMAKE_CURRENT_BINARY_DIR}:${DEFAULT_ROOT_INCLUDE_PATH}"
${ROOT_root_CMD}
-e "gSystem->SetBuildDir(\"${CMAKE_CURRENT_BINARY_DIR}\", true)"
${RootMacroDirDefines}
Expand Down
4 changes: 2 additions & 2 deletions tutorials/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ if(DEFINED ROOT_SOURCE_DIR) # Testing using the binary tree
set(ROOT_environ PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}
${ld_library_path}=${CMAKE_BINARY_DIR}/lib:$ENV{${ld_library_path}}
ROOTSYS=${CMAKE_BINARY_DIR}
ROOT_INCLUDE_PATH=${CMAKE_BINARY_DIR}/tutorials/io/tree
ROOT_INCLUDE_PATH=${CMAKE_BINARY_DIR}/tutorials/io/tree:${DEFAULT_ROOT_INCLUDE_PATH}
PYTHONPATH=${CMAKE_BINARY_DIR}/lib:$ENV{PYTHONPATH})
else()
set(ROOT_environ ROOTSYS=${CMAKE_BINARY_DIR}
ROOT_INCLUDE_PATH=${CMAKE_BINARY_DIR}/tutorials/io/tree
ROOT_INCLUDE_PATH=${CMAKE_BINARY_DIR}/tutorials/io/tree:${DEFAULT_ROOT_INCLUDE_PATH}
PYTHONPATH=${CMAKE_BINARY_DIR}/bin;$ENV{PYTHONPATH})
endif()
else() # testing using an installation
Expand Down
Loading