From 7afe23c248bd495714b70e26c7777c5aac07e59e Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Mon, 27 Aug 2018 23:56:09 -0700 Subject: [PATCH 1/3] Typo --- cmake/modules/RootNewMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake index 7117cadd9d9d2..8e1c264aa0ab0 100644 --- a/cmake/modules/RootNewMacros.cmake +++ b/cmake/modules/RootNewMacros.cmake @@ -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}) From 7e23b3aefa3ce1f4b20d9ffecb533975b354e777 Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Mon, 27 Aug 2018 23:57:05 -0700 Subject: [PATCH 2/3] [cxxmodules] When we have a module we do not need a rootmap. --- cmake/modules/RootNewMacros.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake index 8e1c264aa0ab0..1adf6bca52a54 100644 --- a/cmake/modules/RootNewMacros.cmake +++ b/cmake/modules/RootNewMacros.cmake @@ -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-------------------------- From 834cd6762dbcf24c812372db4f0e834f951467aa Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Mon, 27 Aug 2018 23:57:33 -0700 Subject: [PATCH 3/3] [cxxmodules] Allow ROOT to start if there are no rootmap files. --- core/metacling/src/TCling.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx index 593525f99f9f2..976e2cdde15d9 100644 --- a/core/metacling/src/TCling.cxx +++ b/core/metacling/src/TCling.cxx @@ -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; } }