Skip to content

Commit efecf17

Browse files
Add VDT to default ROOT_INCLUDE_PATH if builtin is set to off
1 parent 50f8476 commit efecf17

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ if(runtime_cxxmodules)
567567
ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b)
568568
else()
569569
set(modules_idx_cmd COMMAND ${ld_library_path}=${library_output_dir}:$ENV{${ld_library_path}}
570+
ROOT_INCLUDE_PATH=${DEFAULT_ROOT_INCLUDE_PATH}
570571
ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b)
571572
endif()
572573
add_custom_command(OUTPUT ${library_output_dir}/modules.idx
@@ -591,6 +592,7 @@ if(WIN32)
591592
ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b -n -x ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C -e return)
592593
else()
593594
set(hsimple_cmd COMMAND ROOT_INCLUDE_PATH="${DEFAULT_ROOT_INCLUDE_PATH}" ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
595+
ROOT_INCLUDE_PATH=${DEFAULT_ROOT_INCLUDE_PATH}
594596
ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b -n -x ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C -e return)
595597
endif()
596598
add_custom_command(OUTPUT tutorials/hsimple.root

cmake/modules/SearchInstalledSoftware.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,6 +1617,8 @@ if(vdt OR builtin_vdt)
16171617
install(DIRECTORY ${CMAKE_BINARY_DIR}/include/vdt
16181618
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT extra-headers)
16191619
set_property(GLOBAL APPEND PROPERTY ROOT_BUILTIN_TARGETS VDT::VDT)
1620+
else()
1621+
BUILD_ROOT_INCLUDE_PATH("${VDT_INCLUDE_DIR}")
16201622
endif()
16211623
endif()
16221624

0 commit comments

Comments
 (0)