Skip to content

Commit 91d8e5f

Browse files
Include headers for all libraries based on ROOT_STANDARD_LIBRARY_PACKAGE
Fixes part of ROOT-10915.
1 parent 91fc407 commit 91d8e5f

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

cmake/modules/RootMacros.cmake

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,16 @@ function(ROOT_STANDARD_LIBRARY_PACKAGE libname)
12421242
endif()
12431243
endif()
12441244

1245+
foreach (h ${ARG_HEADERS})
1246+
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/inc/${h}")
1247+
list(APPEND ARG_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/inc/${h}")
1248+
elseif (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/v7/inc/${h}")
1249+
list(APPEND ARG_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/v7/inc/${h}")
1250+
else()
1251+
message("Could not find directory of header file: ${h}")
1252+
endif()
1253+
endforeach()
1254+
12451255
if (ARG_OBJECT_LIBRARY)
12461256
ROOT_OBJECT_LIBRARY(${libname}Objs ${ARG_SOURCES}
12471257
$<$<BOOL:${ARG_NO_SOURCES}>:dummy.cxx>)

0 commit comments

Comments
 (0)