Skip to content

Cxx modules remove root maps #2542

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
vgvassilev wants to merge 3 commits into from
Closed

Cxx modules remove root maps #2542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7afe23c
Typo
vgvassilev Aug 28, 2018
7e23b3a
[cxxmodules] When we have a module we do not need a rootmap.
vgvassilev Aug 28, 2018
834cd67
[cxxmodules] Allow ROOT to start if there are no rootmap files.
vgvassilev Aug 28, 2018
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
5 changes: 4 additions & 1 deletion cmake/modules/RootNewMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
endif()

if(CMAKE_ROOTTEST_NOROOTMAP)
set(rootmapname )
set(rootmap_name )
set(rootmapargs )
else()
set(rootmapargs -rml ${library_name} -rmf ${rootmap_name})
Expand All @@ -389,6 +389,9 @@ function(ROOT_GENERATE_DICTIONARY dictionary)

if(cpp_module_file)
set(newargs -cxxmodule ${newargs})
# If we have a module file, we do not need to generate the rootmaps.
set(rootmap_name)
set(rootmapargs)
endif()

#---what rootcling command to use--------------------------
Expand Down
2 changes: 1 addition & 1 deletion core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5293,7 +5293,7 @@ Int_t TCling::LoadLibraryMap(const char* rootmapfile)
}
}
delete paths;
if (!fMapfile->GetTable()->GetEntries()) {
if (fMapfile->GetTable() && !fMapfile->GetTable()->GetEntries()) {
return -1;
}
}
Expand Down