Skip to content

Support INTERFACE include directories in ROOT_GENERATE_DICTIONARY #942

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

Closed
dennisklein wants to merge 2 commits into from
Closed

Support INTERFACE include directories in ROOT_GENERATE_DICTIONARY #942

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7080be
Support INTERFACE include directories in ROOT_GENERATE_DICTIONARY
dennisklein Sep 4, 2017
83c5986
Do not ignore BUILD_INTERFACE generator expressions
dennisklein Sep 7, 2017
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
10 changes: 8 additions & 2 deletions cmake/modules/RootNewMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,15 @@ function(ROOT_GENERATE_DICTIONARY dictionary)

foreach(dep ${ARG_DEPENDENCIES})
if(TARGET ${dep})
get_property(dep_include_dirs TARGET ${dep} PROPERTY INCLUDE_DIRECTORIES)
get_property(dep_include_dirs TARGET ${dep} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
foreach(d ${dep_include_dirs})
set(includedirs ${includedirs} -I${d})
string(REGEX MATCHALL "^[$]<.*>$" is_generator_expr ${d})
string(REGEX MATCHALL "^[$]<BUILD_INTERFACE:(.*)>$" is_build_interface ${d})
if(CMAKE_MATCH_0)
set(includedirs ${includedirs} -I${CMAKE_MATCH_0})
elseif(NOT is_generator_expr)
set(includedirs ${includedirs} -I${d})
endif()
endforeach()
endif()
endforeach()
Expand Down