Adapt all CMakeLists.txt files to the new rootmap generation

mechanism which does not involve rlibmap anymore but
rootcling instead.
Basically all the calls to the macro calling rlibmap have been
removed.

Signed-off-by: Danilo Piparo <danilo.piparo@cern.ch>
Signed-off-by: Fons Rademakers <Fons.Rademakers@cern.ch>

bindings/pyroot/CMakeLists.txt

@@ -6,7 +6,7 @@ ROOT_USE_PACKAGE(tree/tree)
 include_directories(${PYTHON_INCLUDE_DIRS})
 
 ROOT_GENERATE_DICTIONARY(G__PyROOT *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(PyROOT LINKDEF LinkDef.h)
+
 
 ROOT_LINKER_LIBRARY(PyROOT *.cxx G__PyROOT.cxx LIBRARIES RIO Net Hist Graf Graf3d Gpad Tree Matrix Thread ${PYTHON_LIBRARIES})
 if(WIN32)

bindings/ruby/CMakeLists.txt

@@ -6,7 +6,7 @@ ROOT_USE_PACKAGE(tree/tree)
 include_directories(${RUBY_INCLUDE_DIRS})
 
 ROOT_GENERATE_DICTIONARY(G__Ruby *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Ruby LINKDEF LinkDef.h)
+
 
 ROOT_LINKER_LIBRARY(Ruby *.cxx G__Ruby.cxx LIBRARIES ${RUBY_LIBRARY} ${CMAKE_DL_LIBS} DEPENDENCIES Hist MathCore)
 if(MACOSX_MINOR EQUAL 5)

core/CMakeLists.txt

@@ -76,7 +76,7 @@ ROOT_GENERATE_DICTIONARY(base/G__Core
                          OPTIONS ${dict_opts}
                          LINKDEF base/inc/LinkDef.h)
 
-ROOT_GENERATE_ROOTMAP(Core LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/base/inc/LinkDef.h)
+
 
 ROOT_LINKER_LIBRARY(Core ${LibCore_SRCS} base/G__Core.cxx
                     $<TARGET_OBJECTS:Base>

core/meta/CMakeLists.txt

@@ -18,7 +18,7 @@ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/TClingCallbacks.cxx
 #ROOT_GENERATE_DICTIONARY(G__Cling ${CMAKE_CURRENT_SOURCE_DIR}/src/TCling.h
 #                         MODULE Cling DEPENDENCIES Core
 #                         LINKDEF LinkDefCling.h)
-ROOT_GENERATE_ROOTMAP(Cling LINKDEF LinkDefCling.h)
+
 ROOT_LINKER_LIBRARY(Cling ${sources}  # G__Cling.cxx 
                     ${CMAKE_SOURCE_DIR}/core/metautils/src/TMetaUtils.cxx 
                     $<TARGET_OBJECTS:MetaUtilsLLVM>

core/metautils/CMakeLists.txt

@@ -39,6 +39,5 @@ foreach(dict ${stldicts})
   string(REPLACE "2" "" header ${dict})
   string(REPLACE "multi" "" header ${header})
   ROOT_GENERATE_DICTIONARY(G__std_${dict} OPTIONS ${header} LINKDEF src/${dict}Linkdef.h)
-  ROOT_GENERATE_ROOTMAP(${dict}Dict LINKDEF ../src/${dict}Linkdef.h DEPENDENCIES Core)
   ROOT_LINKER_LIBRARY(${dict}Dict G__std_${dict}.cxx DEPENDENCIES  Core)
 endforeach()

core/rint/CMakeLists.txt

@@ -4,6 +4,6 @@
 ROOT_USE_PACKAGE(core)
 
 ROOT_GENERATE_DICTIONARY(G__Rint *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Rint LINKDEF LinkDef.h)
+
 ROOT_LINKER_LIBRARY(Rint *.cxx G__Rint.cxx DEPENDENCIES Core)
 ROOT_INSTALL_HEADERS()

core/thread/CMakeLists.txt

@@ -26,6 +26,6 @@ else()
 endif() 
 
 ROOT_GENERATE_DICTIONARY(G__Thread ${headers} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Thread LINKDEF LinkDef.h DEPENDENCIES)
+
 ROOT_LINKER_LIBRARY(Thread ${sources} G__Thread.cxx LIBRARIES  ${CMAKE_THREAD_LIBS_INIT} DEPENDENCIES Core)
 ROOT_INSTALL_HEADERS()

core/utils/CMakeLists.txt

@@ -88,6 +88,3 @@ add_custom_target(LLVMRES COMMAND cmake -E make_directory
 #---Trick to avoid building all dictionaties when CINT is changed-------------
 add_custom_target(ROOTCINTTARGET DEPENDS rootcling rootcling_tmp LLVMRES)
 
-#---rlibmap executable--------------------------------------------------------
-ROOT_EXECUTABLE(rlibmap rlibmap.cxx LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-

geom/gdml/CMakeLists.txt

@@ -6,7 +6,7 @@ ROOT_USE_PACKAGE(geom/geom)
 ROOT_USE_PACKAGE(io/xml)
 
 ROOT_GENERATE_DICTIONARY(G__Gdml *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Gdml LINKDEF LinkDef.h DEPENDENCIES Geom XMLIO Hist RIO)
+
 ROOT_LINKER_LIBRARY(Gdml *.cxx G__Gdml.cxx DEPENDENCIES Geom XMLIO Hist RIO)
 ROOT_INSTALL_HEADERS()
 

geom/geom/CMakeLists.txt

@@ -28,7 +28,7 @@ set(headers2 TGeoPatternFinder.h TGeoCache.h TVirtualMagField.h
 ROOT_GENERATE_DICTIONARY(G__${libname}1 ${headers1} LINKDEF LinkDef1.h)
 ROOT_GENERATE_DICTIONARY(G__${libname}2 ${headers2} LINKDEF LinkDef2.h)
 
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef1.h  LinkDef2.h DEPENDENCIES Thread RIO MathCore)
+
 ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}1.cxx G__${libname}2.cxx DEPENDENCIES Thread RIO MathCore)
 ROOT_INSTALL_HEADERS()
 

geom/geombuilder/CMakeLists.txt

@@ -19,7 +19,7 @@ set(headers TGeoVolumeEditor.h TGeoBBoxEditor.h TGeoMediumEditor.h
 
 ROOT_GENERATE_DICTIONARY(G__${libname} ${headers} LINKDEF LinkDef.h)
 
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Geom Graf3d Gpad Graf Gui Ged)
+
 ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx DEPENDENCIES Geom Graf3d Gpad Graf Gui Ged)
 ROOT_INSTALL_HEADERS()
 

geom/geompainter/CMakeLists.txt

@@ -12,7 +12,7 @@ ROOT_USE_PACKAGE(tree/tree)
 
 ROOT_GENERATE_DICTIONARY(G__${libname} T*.h LINKDEF LinkDef.h)
 
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Geom Tree Graf3d Hist Gpad RIO MathCore)
+
 ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx DEPENDENCIES Geom Tree Graf3d Hist Gpad RIO)
 ROOT_INSTALL_HEADERS()
 

graf2d/asimage/CMakeLists.txt

@@ -23,7 +23,7 @@ include_directories(${CMAKE_SOURCE_DIR}/hist/hist/inc)  # This is to avoid a cir
 include_directories(${FREETYPE_INCLUDE_DIRS} ${AFTERIMAGE_INCLUDE_DIR} ${X11_INCLUDE_DIR})
 
 ROOT_GENERATE_DICTIONARY(G__ASImage TASImage.h TASImagePlugin.h TASPluginGS.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(ASImage LINKDEF LinkDef.h DEPENDENCIES Graf MathCore)
+
 ROOT_LINKER_LIBRARY(ASImage TASImage.cxx TASPluginGS.cxx  G__ASImage.cxx 
                     LIBRARIES Core ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES}
                     ${ZLIB_LIBRARY} DEPENDENCIES Graf)
@@ -35,7 +35,7 @@ if(builtin_freetype)
 endif()
 
 ROOT_GENERATE_DICTIONARY(G__ASImageGui TASPaletteEditor.h LINKDEF LinkDefGui.h)
-ROOT_GENERATE_ROOTMAP(ASImageGui LINKDEF LinkDefGui.h DEPENDENCIES Graf Hist Gui ASImage RIO )
+
 ROOT_LINKER_LIBRARY(ASImageGui TASPaletteEditor.cxx G__ASImageGui.cxx 
                     LIBRARIES ${AFTERIMAGE_LIBRARIES} ${FREETYPE_LIBRARIES} ${ASEXTRA_LIBRARIES} ${X11_LIBRARIES}
                     ${ZLIB_LIBRARY} DEPENDENCIES Gui ASImage)

graf2d/cocoa/CMakeLists.txt

@@ -11,7 +11,7 @@ add_definitions("-ObjC++")
 include_directories(${FREETYPE_INCLUDE_DIRS})
 
 ROOT_GENERATE_DICTIONARY(G__Cocoa T*.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(GCocoa LINKDEF LinkDef.h DEPENDENCIES Gui GQuartz )
+
 ROOT_LINKER_LIBRARY(GCocoa *.mm  G__Cocoa.cxx LIBRARIES  "-framework Cocoa" "-framework OpenGL" ${FREETYPE_LIBRARIES} DEPENDENCIES Gui GQuartz )
 ROOT_INSTALL_HEADERS()
 

graf2d/fitsio/CMakeLists.txt

@@ -9,7 +9,7 @@ ROOT_USE_PACKAGE(hist/hist)
 include_directories(${CFITSIO_INCLUDE_DIR})
 
 ROOT_GENERATE_DICTIONARY(G__FITSIO *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(FITSIO LINKDEF LinkDef.h DEPENDENCIES Hist Gpad Graf Matrix)
+
 ROOT_LINKER_LIBRARY(FITSIO *.cxx G__FITSIO.cxx LIBRARIES ${CFITSIO_LIBRARIES} DEPENDENCIES Hist Gpad Graf Matrix)
 ROOT_INSTALL_HEADERS()
 

graf2d/gpad/CMakeLists.txt

@@ -8,6 +8,6 @@ ROOT_USE_PACKAGE(core)
 include_directories(${CMAKE_SOURCE_DIR}/hist/hist/inc)  # This is to avoid a circular dependency graf <--> hist 
 
 ROOT_GENERATE_DICTIONARY(G__GPad *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Gpad LINKDEF LinkDef.h DEPENDENCIES Graf Hist)
+
 ROOT_LINKER_LIBRARY(Gpad *.cxx G__GPad.cxx DEPENDENCIES Graf Hist)
 ROOT_INSTALL_HEADERS()

graf2d/graf/CMakeLists.txt

@@ -12,7 +12,7 @@ ROOT_USE_PACKAGE(graf2d/mathtext)
 include_directories(${CMAKE_SOURCE_DIR}/hist/hist/inc)  # This is to avoid a circular dependency graf <--> hist
 
 ROOT_GENERATE_DICTIONARY(G__${libname} *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Hist Matrix MathCore RIO)
+
 
 include_directories(${FREETYPE_INCLUDE_DIRS})
 

graf2d/gviz/CMakeLists.txt

@@ -10,7 +10,7 @@ ROOT_USE_PACKAGE(graf2d/graf)
 include_directories(${GRAPHVIZ_INCLUDE_DIR}/graphviz)
 
 ROOT_GENERATE_DICTIONARY(G__Gviz *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Gviz LINKDEF LinkDef.h DEPENDENCIES Hist Graf)
+
 ROOT_LINKER_LIBRARY(Gviz *.cxx G__Gviz.cxx 
                     LIBRARIES ${GRAPHVIZ_GRAPH_LIBRARY} ${GRAPHVIZ_GVC_LIBRARY} 
                     DEPENDENCIES Hist Graf)

graf2d/postscript/CMakeLists.txt

@@ -7,6 +7,6 @@ ROOT_USE_PACKAGE(graf2d/graf)
 ROOT_USE_PACKAGE(graf2d/mathtext)
 
 ROOT_GENERATE_DICTIONARY(G__PostScript *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Postscript LINKDEF LinkDef.h DEPENDENCIES Graf)
+
 ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES  ${ZLIB_LIBRARY} mathtext DEPENDENCIES Graf)
 ROOT_INSTALL_HEADERS()

graf2d/qt/CMakeLists.txt

@@ -16,7 +16,7 @@ QT4_WRAP_CPP(mocfiles inc/TQtWidget.h inc/TQtEmitter.h inc/TQtClientFilter.h
                       inc/TQtRootSlot.h)
 
 ROOT_GENERATE_DICTIONARY(G__GQt ${headers} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(GQt LINKDEF LinkDef.h DEPENDENCIES Gui Gpad Graf Rint)
+
 
 ROOT_LINKER_LIBRARY(GQt *.cxx ${mocfiles} G__GQt.cxx LIBRARIES ${QT_LIBRARIES} DEPENDENCIES Gui Gpad Graf Rint)