From e5901e0ce671a1c196b55308598f63b46d2ed704 Mon Sep 17 00:00:00 2001
From: Danilo Piparo <danilo.piparo@cern.ch>
Date: Tue, 10 Dec 2013 17:44:30 +0100
Subject: [PATCH] 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 | 2 +-
bindings/ruby/CMakeLists.txt | 2 +-
core/CMakeLists.txt | 2 +-
core/meta/CMakeLists.txt | 2 +-
core/metautils/CMakeLists.txt | 1 -
core/rint/CMakeLists.txt | 2 +-
core/thread/CMakeLists.txt | 2 +-
core/utils/CMakeLists.txt | 3 ---
geom/gdml/CMakeLists.txt | 2 +-
geom/geom/CMakeLists.txt | 2 +-
geom/geombuilder/CMakeLists.txt | 2 +-
geom/geompainter/CMakeLists.txt | 2 +-
graf2d/asimage/CMakeLists.txt | 4 ++--
graf2d/cocoa/CMakeLists.txt | 2 +-
graf2d/fitsio/CMakeLists.txt | 2 +-
graf2d/gpad/CMakeLists.txt | 2 +-
graf2d/graf/CMakeLists.txt | 2 +-
graf2d/gviz/CMakeLists.txt | 2 +-
graf2d/postscript/CMakeLists.txt | 2 +-
graf2d/qt/CMakeLists.txt | 2 +-
graf2d/quartz/CMakeLists.txt | 2 +-
graf2d/win32gdk/CMakeLists.txt | 2 +-
graf2d/x11/CMakeLists.txt | 2 +-
graf2d/x11ttf/CMakeLists.txt | 2 +-
graf3d/eve/CMakeLists.txt | 2 +-
graf3d/g3d/CMakeLists.txt | 2 +-
graf3d/gl/CMakeLists.txt | 2 +-
graf3d/gviz3d/CMakeLists.txt | 2 +-
graf3d/x3d/CMakeLists.txt | 2 +-
gui/gui/CMakeLists.txt | 2 +-
gui/qtgsi/CMakeLists.txt | 2 +-
gui/qtroot/CMakeLists.txt | 2 +-
hist/hbook/CMakeLists.txt | 2 +-
hist/hist/CMakeLists.txt | 2 +-
hist/histpainter/CMakeLists.txt | 2 +-
hist/spectrumpainter/CMakeLists.txt | 2 +-
io/castor/CMakeLists.txt | 2 +-
io/dcache/CMakeLists.txt | 2 +-
io/gfal/CMakeLists.txt | 2 +-
io/io/CMakeLists.txt | 2 +-
io/rfio/CMakeLists.txt | 2 +-
io/sql/CMakeLists.txt | 2 +-
io/xml/CMakeLists.txt | 2 +-
io/xmlparser/CMakeLists.txt | 2 +-
math/fftw/CMakeLists.txt | 2 +-
math/genetic/CMakeLists.txt | 2 +-
math/genvector/CMakeLists.txt | 8 +-------
math/mathcore/CMakeLists.txt | 2 +-
math/mathmore/CMakeLists.txt | 2 +-
math/minuit2/CMakeLists.txt | 2 +-
math/smatrix/CMakeLists.txt | 2 +-
math/unuran/CMakeLists.txt | 2 +-
misc/memstat/CMakeLists.txt | 2 +-
misc/table/CMakeLists.txt | 2 +-
montecarlo/eg/CMakeLists.txt | 2 +-
montecarlo/pythia6/CMakeLists.txt | 2 +-
montecarlo/pythia8/CMakeLists.txt | 2 +-
net/alien/CMakeLists.txt | 2 +-
net/auth/CMakeLists.txt | 3 +--
net/bonjour/CMakeLists.txt | 2 +-
net/davix/CMakeLists.txt | 2 +-
net/krb5auth/CMakeLists.txt | 2 +-
net/ldap/CMakeLists.txt | 2 +-
net/monalisa/CMakeLists.txt | 2 +-
net/net/CMakeLists.txt | 2 +-
net/netx/CMakeLists.txt | 2 +-
net/netxng/CMakeLists.txt | 2 +-
proof/proof/CMakeLists.txt | 2 +-
proof/proofbench/CMakeLists.txt | 2 +-
proof/proofplayer/CMakeLists.txt | 4 ++--
proof/proofx/CMakeLists.txt | 2 +-
roofit/histfactory/CMakeLists.txt | 3 +--
roofit/roofit/CMakeLists.txt | 3 +--
roofit/roostats/CMakeLists.txt | 3 +--
sql/mysql/CMakeLists.txt | 2 +-
sql/odbc/CMakeLists.txt | 2 +-
sql/oracle/CMakeLists.txt | 2 +-
sql/pgsql/CMakeLists.txt | 2 +-
sql/sqlite/CMakeLists.txt | 2 +-
tmva/CMakeLists.txt | 3 +--
tree/tree/CMakeLists.txt | 2 +-
tree/treeplayer/CMakeLists.txt | 2 +-
tree/treeviewer/CMakeLists.txt | 2 +-
83 files changed, 83 insertions(+), 98 deletions(-)
diff --git a/bindings/pyroot/CMakeLists.txt b/bindings/pyroot/CMakeLists.txt
index 80752958807..363f041fec6 100644
--- a/bindings/pyroot/CMakeLists.txt
+++ b/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)
diff --git a/bindings/ruby/CMakeLists.txt b/bindings/ruby/CMakeLists.txt
index f59541fd380..f3acacfb19a 100644
--- a/bindings/ruby/CMakeLists.txt
+++ b/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)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index e4c0b8c36d0..d18684521e2 100644
--- a/core/CMakeLists.txt
+++ b/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>
diff --git a/core/meta/CMakeLists.txt b/core/meta/CMakeLists.txt
index dd80a5bab82..07e812f93ab 100644
--- a/core/meta/CMakeLists.txt
+++ b/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>
diff --git a/core/metautils/CMakeLists.txt b/core/metautils/CMakeLists.txt
index df06adab2e5..50023bdc168 100644
--- a/core/metautils/CMakeLists.txt
+++ b/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()
diff --git a/core/rint/CMakeLists.txt b/core/rint/CMakeLists.txt
index a3073414c30..613511ebd99 100644
--- a/core/rint/CMakeLists.txt
+++ b/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()
diff --git a/core/thread/CMakeLists.txt b/core/thread/CMakeLists.txt
index 1804c71f997..1747dbd5a01 100644
--- a/core/thread/CMakeLists.txt
+++ b/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()
diff --git a/core/utils/CMakeLists.txt b/core/utils/CMakeLists.txt
index 15a3ac220f8..47af9d69ea3 100644
--- a/core/utils/CMakeLists.txt
+++ b/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})
-
diff --git a/geom/gdml/CMakeLists.txt b/geom/gdml/CMakeLists.txt
index 2791f5f30a3..6789120a474 100644
--- a/geom/gdml/CMakeLists.txt
+++ b/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()
diff --git a/geom/geom/CMakeLists.txt b/geom/geom/CMakeLists.txt
index 038272342d7..ad0243b97f6 100644
--- a/geom/geom/CMakeLists.txt
+++ b/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()
diff --git a/geom/geombuilder/CMakeLists.txt b/geom/geombuilder/CMakeLists.txt
index f765c738bdf..6a56d808807 100644
--- a/geom/geombuilder/CMakeLists.txt
+++ b/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()
diff --git a/geom/geompainter/CMakeLists.txt b/geom/geompainter/CMakeLists.txt
index a9541b6fee4..b246baf8365 100644
--- a/geom/geompainter/CMakeLists.txt
+++ b/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()
diff --git a/graf2d/asimage/CMakeLists.txt b/graf2d/asimage/CMakeLists.txt
index ea540eaa812..aee0264f44b 100644
--- a/graf2d/asimage/CMakeLists.txt
+++ b/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)
diff --git a/graf2d/cocoa/CMakeLists.txt b/graf2d/cocoa/CMakeLists.txt
index 5a28ea25914..254aceeca9b 100644
--- a/graf2d/cocoa/CMakeLists.txt
+++ b/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()
diff --git a/graf2d/fitsio/CMakeLists.txt b/graf2d/fitsio/CMakeLists.txt
index da5ea6d6571..4e8fa6f4519 100644
--- a/graf2d/fitsio/CMakeLists.txt
+++ b/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()
diff --git a/graf2d/gpad/CMakeLists.txt b/graf2d/gpad/CMakeLists.txt
index 93bcb18ffe3..677d4646ede 100644
--- a/graf2d/gpad/CMakeLists.txt
+++ b/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()
diff --git a/graf2d/graf/CMakeLists.txt b/graf2d/graf/CMakeLists.txt
index 1224f4487c5..89236b47ae1 100644
--- a/graf2d/graf/CMakeLists.txt
+++ b/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})
diff --git a/graf2d/gviz/CMakeLists.txt b/graf2d/gviz/CMakeLists.txt
index a7b1eeb23e0..3c3abf1f755 100644
--- a/graf2d/gviz/CMakeLists.txt
+++ b/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)
diff --git a/graf2d/postscript/CMakeLists.txt b/graf2d/postscript/CMakeLists.txt
index 011a43e29d1..e4571a44519 100644
--- a/graf2d/postscript/CMakeLists.txt
+++ b/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()
diff --git a/graf2d/qt/CMakeLists.txt b/graf2d/qt/CMakeLists.txt
index 2e33ad42afa..f8773e577c2 100644
--- a/graf2d/qt/CMakeLists.txt
+++ b/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)
diff --git a/graf2d/quartz/CMakeLists.txt b/graf2d/quartz/CMakeLists.txt
index 940e5a3e8a1..29f5d231492 100644
--- a/graf2d/quartz/CMakeLists.txt
+++ b/graf2d/quartz/CMakeLists.txt
@@ -6,7 +6,7 @@
add_definitions("-ObjC++")
ROOT_GENERATE_DICTIONARY(G__Quartz "" LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(GQuartz LINKDEF LinkDef.h DEPENDENCIES Core)
+
ROOT_LINKER_LIBRARY(GQuartz *.mm G__Quartz.cxx LIBRARIES "-framework Cocoa" DEPENDENCIES Core)
ROOT_INSTALL_HEADERS()
diff --git a/graf2d/win32gdk/CMakeLists.txt b/graf2d/win32gdk/CMakeLists.txt
index b1b348e3202..bf7bb7189ca 100644
--- a/graf2d/win32gdk/CMakeLists.txt
+++ b/graf2d/win32gdk/CMakeLists.txt
@@ -87,7 +87,7 @@ set_target_properties(GDKLIB PROPERTIES FOLDER Builtins)
#
ROOT_GENERATE_DICTIONARY(G__Win32gdk TGWin32.h TGWin32GL.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Win32gdk LINKDEF LinkDef.h DEPENDENCIES)
+
#
# The library itself
diff --git a/graf2d/x11/CMakeLists.txt b/graf2d/x11/CMakeLists.txt
index da4dbac330c..2d389cc5bb8 100644
--- a/graf2d/x11/CMakeLists.txt
+++ b/graf2d/x11/CMakeLists.txt
@@ -8,7 +8,7 @@ ROOT_USE_PACKAGE(core)
include_directories(${X11_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__${libname} T*.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h)
+
ROOT_LINKER_LIBRARY(${libname} *.cxx *.c G__${libname}.cxx LIBRARIES Core ${X11_LIBRARIES} ${X11_Xpm_LIB} ${CMAKE_THREAD_LIBS_INIT})
ROOT_INSTALL_HEADERS()
diff --git a/graf2d/x11ttf/CMakeLists.txt b/graf2d/x11ttf/CMakeLists.txt
index 20a9ab7c203..c6b36ca5061 100644
--- a/graf2d/x11ttf/CMakeLists.txt
+++ b/graf2d/x11ttf/CMakeLists.txt
@@ -9,7 +9,7 @@ ROOT_USE_PACKAGE(graf2d/x11)
include_directories(${FREETYPE_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__${libname} *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES GX11 Graf)
+
ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx
LIBRARIES ${X11_LIBRARIES} ${X11_Xpm_LIB} ${X11_Xft_LIB} ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}
diff --git a/graf3d/eve/CMakeLists.txt b/graf3d/eve/CMakeLists.txt
index 2f1ff85f964..801831817e9 100644
--- a/graf3d/eve/CMakeLists.txt
+++ b/graf3d/eve/CMakeLists.txt
@@ -29,7 +29,7 @@ set(headers2 TEveArrow*.h TEveBox*.h TEveCalo*.h
ROOT_GENERATE_DICTIONARY(G__Eve1 ${headers1} LINKDEF LinkDef1.h)
ROOT_GENERATE_DICTIONARY(G__Eve2 ${headers2} LINKDEF LinkDef2.h)
-ROOT_GENERATE_ROOTMAP(Eve LINKDEF LinkDef1.h LinkDef2.h DEPENDENCIES Geom GeomPainter Graf3d Gui Gpad Graf Hist Physics Ged EG Tree TreePlayer RGL RIO Rint MathCore)
+
ROOT_LINKER_LIBRARY(Eve *.cxx G__Eve1.cxx G__Eve2.cxx LIBRARIES ${OPENGL_LIBRARIES} GLEW FTGL Core DEPENDENCIES Geom Ged RGL Physics EG)
ROOT_INSTALL_HEADERS()
diff --git a/graf3d/g3d/CMakeLists.txt b/graf3d/g3d/CMakeLists.txt
index 1c78213eeee..543f11e4e5f 100644
--- a/graf3d/g3d/CMakeLists.txt
+++ b/graf3d/g3d/CMakeLists.txt
@@ -11,7 +11,7 @@ list(REMOVE_ITEM headers1 ${CMAKE_CURRENT_SOURCE_DIR}/inc/X3DBuffer.h)
set(headers2 X3DBuffer.h )
ROOT_GENERATE_DICTIONARY(G__G3D ${headers1} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Graf Hist Gpad MathCore)
+
ROOT_LINKER_LIBRARY(${libname} *.cxx *.c G__G3D.cxx DEPENDENCIES Graf Hist Gpad MathCore)
ROOT_INSTALL_HEADERS()
diff --git a/graf3d/gl/CMakeLists.txt b/graf3d/gl/CMakeLists.txt
index d452edd936b..d9c1ba9158e 100644
--- a/graf3d/gl/CMakeLists.txt
+++ b/graf3d/gl/CMakeLists.txt
@@ -30,7 +30,7 @@ set_source_files_properties(src/TGLFontManager.cxx PROPERTIES COMPILE_FLAGS "${F
set_source_files_properties(src/TGLText.cxx PROPERTIES COMPILE_FLAGS "${FTGL_CFLAGS}")
ROOT_GENERATE_DICTIONARY(G__GL ${headers} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RGL LINKDEF LinkDef.h DEPENDENCIES Graf3d Gui Graf Hist Ged MathCore Tree TreePlayer)
+
ROOT_LINKER_LIBRARY(RGL ${sources} G__GL.cxx LIBRARIES ${gllibs} GLEW ${FTGL_LIBRARIES} DEPENDENCIES Hist Gui Ged)
ROOT_INSTALL_HEADERS()
diff --git a/graf3d/gviz3d/CMakeLists.txt b/graf3d/gviz3d/CMakeLists.txt
index bc3feeb6fa8..4dd56e410a6 100644
--- a/graf3d/gviz3d/CMakeLists.txt
+++ b/graf3d/gviz3d/CMakeLists.txt
@@ -8,6 +8,6 @@ ROOT_USE_PACKAGE(graf3d/gl)
ROOT_USE_PACKAGE(geom/geom)
ROOT_GENERATE_DICTIONARY(G__Gviz3d *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Gviz3d LINKDEF LinkDef.h DEPENDENCIES Gui Ged Gpad Graf3d Graf Geom RGL)
+
ROOT_LINKER_LIBRARY(Gviz3d *.cxx G__Gviz3d.cxx LIBRARIES GLEW FTGL DEPENDENCIES Gui Ged Geom RGL)
ROOT_INSTALL_HEADERS()
diff --git a/graf3d/x3d/CMakeLists.txt b/graf3d/x3d/CMakeLists.txt
index cb53e2ccd41..4313eb209d3 100644
--- a/graf3d/x3d/CMakeLists.txt
+++ b/graf3d/x3d/CMakeLists.txt
@@ -9,6 +9,6 @@ ROOT_USE_PACKAGE(gui/gui)
include_directories(${X11_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__X3D TViewerX3D.h TX3DFrame.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Graf3d Gui)
+
ROOT_LINKER_LIBRARY(${libname} *.cxx *.c G__X3D.cxx LIBRARIES ${X11_LIBRARIES} DEPENDENCIES Graf3d Gui)
ROOT_INSTALL_HEADERS()
diff --git a/gui/gui/CMakeLists.txt b/gui/gui/CMakeLists.txt
index 9c3e8a8b6e9..18cacc2c832 100644
--- a/gui/gui/CMakeLists.txt
+++ b/gui/gui/CMakeLists.txt
@@ -38,7 +38,7 @@ set(headers3 TRootGuiFactory.h TRootApplication.h TRootCanvas.h
include_directories(${CMAKE_SOURCE_DIR}/)
ROOT_GENERATE_DICTIONARY(libGui ${headers1} ${headers2} ${headers3} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef1.h LinkDef2.h LinkDef3.h DEPENDENCIES Gpad Graf RIO MathCore)
+
ROOT_LINKER_LIBRARY(${libname} *.cxx libGui.cxx LIBRARIES Core DEPENDENCIES Gpad Graf MathCore) #Use 1 big dict
ROOT_INSTALL_HEADERS()
diff --git a/gui/qtgsi/CMakeLists.txt b/gui/qtgsi/CMakeLists.txt
index bf5202b604a..6ff3cef7e12 100644
--- a/gui/qtgsi/CMakeLists.txt
+++ b/gui/qtgsi/CMakeLists.txt
@@ -13,7 +13,7 @@ QT4_WRAP_CPP(mocfiles inc/TQCanvasMenu.h inc/TQRootApplication.h
inc/TQRootCanvas.h inc/TQRootDialog.h)
ROOT_GENERATE_DICTIONARY(G__QtGSI *.h LINKDEF LinkDef.h OPTIONS -DQTVERS=0x${QT_VERSION_NUM})
-ROOT_GENERATE_ROOTMAP(QtGSI LINKDEF LinkDef.h DEPENDENCIES Gui Gpad )
+
ROOT_LINKER_LIBRARY(QtGSI *.cxx ${mocfiles} G__QtGSI.cxx LIBRARIES ${QT_LIBRARIES} ${QT_QT3SUPPORT_LIBRARY} DEPENDENCIES Gui Gpad)
ROOT_INSTALL_HEADERS()
diff --git a/gui/qtroot/CMakeLists.txt b/gui/qtroot/CMakeLists.txt
index d8135ca3028..2cc8ce953ec 100644
--- a/gui/qtroot/CMakeLists.txt
+++ b/gui/qtroot/CMakeLists.txt
@@ -9,7 +9,7 @@ ROOT_USE_PACKAGE(graf2d/qt)
include(${QT_USE_FILE})
ROOT_GENERATE_DICTIONARY(G__QtRoot *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(QtRoot LINKDEF LinkDef.h DEPENDENCIES Gui GQt )
+
ROOT_LINKER_LIBRARY(QtRoot *.cxx G__QtRoot.cxx LIBRARIES Core DEPENDENCIES Gui GQt)
ROOT_INSTALL_HEADERS()
diff --git a/hist/hbook/CMakeLists.txt b/hist/hbook/CMakeLists.txt
index e28b795e010..31d9cb5b096 100644
--- a/hist/hbook/CMakeLists.txt
+++ b/hist/hbook/CMakeLists.txt
@@ -8,7 +8,7 @@ ROOT_USE_PACKAGE(hist/hist)
ROOT_USE_PACKAGE(tree/treeplayer)
ROOT_GENERATE_DICTIONARY(G__${libname} *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Hist Matrix Tree Graf TreePlayer RIO minicern )
+
ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx DEPENDENCIES Hist Matrix Tree Graf TreePlayer RIO minicern )
ROOT_INSTALL_HEADERS()
diff --git a/hist/hist/CMakeLists.txt b/hist/hist/CMakeLists.txt
index 1f2fc871fac..90eb595af7c 100644
--- a/hist/hist/CMakeLists.txt
+++ b/hist/hist/CMakeLists.txt
@@ -11,7 +11,7 @@ ROOT_USE_PACKAGE(io/io)
include_directories(${CMAKE_SOURCE_DIR}/graf3d/g3d/inc) # This is to avoid a circular dependency g3d <--> hist
ROOT_GENERATE_DICTIONARY(G__${libname} *.h Math/*.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Matrix MathCore)
+
ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx DEPENDENCIES Matrix MathCore)
ROOT_INSTALL_HEADERS()
diff --git a/hist/histpainter/CMakeLists.txt b/hist/histpainter/CMakeLists.txt
index 43a0b2de34a..c74b842d2c8 100644
--- a/hist/histpainter/CMakeLists.txt
+++ b/hist/histpainter/CMakeLists.txt
@@ -8,7 +8,7 @@ ROOT_USE_PACKAGE(hist/hist)
ROOT_GENERATE_DICTIONARY(G__${libname} *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Graf Hist Matrix MathCore Gpad )
+
ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx DEPENDENCIES Graf Hist Matrix MathCore Gpad )
ROOT_INSTALL_HEADERS()
diff --git a/hist/spectrumpainter/CMakeLists.txt b/hist/spectrumpainter/CMakeLists.txt
index 29d2aca1d8d..0daa3fd649b 100644
--- a/hist/spectrumpainter/CMakeLists.txt
+++ b/hist/spectrumpainter/CMakeLists.txt
@@ -8,7 +8,7 @@ ROOT_USE_PACKAGE(hist/hist)
ROOT_GENERATE_DICTIONARY(G__Spectrum2Painter *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Graf Hist )
+
ROOT_LINKER_LIBRARY(${libname} *.cxx G__Spectrum2Painter.cxx DEPENDENCIES Graf Hist )
ROOT_INSTALL_HEADERS()
diff --git a/io/castor/CMakeLists.txt b/io/castor/CMakeLists.txt
index 4bc912dedf6..52854f8123a 100644
--- a/io/castor/CMakeLists.txt
+++ b/io/castor/CMakeLists.txt
@@ -11,7 +11,7 @@ if(CASTOR_VERSION VERSION_GREATER "2.0.0")
endif()
ROOT_GENERATE_DICTIONARY(G__CASTOR *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RCastor LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(RCastor *.cxx G__CASTOR.cxx LIBRARIES Core ${CASTOR_LIBRARIES} ${CASTOR_rfio_LIBRARY}
${CASTOR_ns_LIBRARY} ${CASTOR_common_LIBRARY} ${CASTOR_client_LIBRARY}
DEPENDENCIES Net RIO)
diff --git a/io/dcache/CMakeLists.txt b/io/dcache/CMakeLists.txt
index 86288688cf2..30ad37886bc 100644
--- a/io/dcache/CMakeLists.txt
+++ b/io/dcache/CMakeLists.txt
@@ -8,6 +8,6 @@ include_directories(${DCAP_INCLUDE_DIRS})
add_definitions(-pthread)
ROOT_GENERATE_DICTIONARY(G__DCache *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(DCache LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(DCache *.cxx G__DCache.cxx LIBRARIES Core ${DCAP_LIBRARIES} DEPENDENCIES Net RIO)
ROOT_INSTALL_HEADERS()
diff --git a/io/gfal/CMakeLists.txt b/io/gfal/CMakeLists.txt
index 7befab07220..9a66d685e1f 100644
--- a/io/gfal/CMakeLists.txt
+++ b/io/gfal/CMakeLists.txt
@@ -9,6 +9,6 @@ include_directories(${GFAL_INCLUDE_DIRS})
add_definitions(-D_FILE_OFFSET_BITS=64)
ROOT_GENERATE_DICTIONARY(G__GFAL *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(GFAL LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(GFAL *.cxx G__GFAL.cxx LIBRARIES Core ${GFAL_LIBRARIES} DEPENDENCIES Net RIO)
ROOT_INSTALL_HEADERS()
diff --git a/io/io/CMakeLists.txt b/io/io/CMakeLists.txt
index d150b1ef72f..e3b256fdda8 100644
--- a/io/io/CMakeLists.txt
+++ b/io/io/CMakeLists.txt
@@ -11,7 +11,7 @@ ROOT_USE_PACKAGE(math/mathcore)
ROOT_GENERATE_DICTIONARY(G__IO *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h )
+
ROOT_LINKER_LIBRARY(${libname} *.cxx G__IO.cxx LIBRARIES ${CMAKE_DL_LIBS}
DEPENDENCIES Core Thread)
diff --git a/io/rfio/CMakeLists.txt b/io/rfio/CMakeLists.txt
index a656a67a69c..6604b1687f8 100644
--- a/io/rfio/CMakeLists.txt
+++ b/io/rfio/CMakeLists.txt
@@ -7,7 +7,7 @@ ROOT_USE_PACKAGE(net/net)
include_directories(${CASTOR_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__RFIO *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RFIO LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(RFIO *.cxx G__RFIO.cxx LIBRARIES Core ${CASTOR_LIBRARIES}
${CASTOR_rfio_LIBRARY} ${CASTOR_common_LIBRARY} ${CASTOR_client_LIBRARY} DEPENDENCIES Net RIO)
ROOT_INSTALL_HEADERS()
diff --git a/io/sql/CMakeLists.txt b/io/sql/CMakeLists.txt
index d59a18ab2c7..02da8b3cd7c 100644
--- a/io/sql/CMakeLists.txt
+++ b/io/sql/CMakeLists.txt
@@ -6,7 +6,7 @@ ROOT_USE_PACKAGE(io/io)
ROOT_USE_PACKAGE(net/net)
ROOT_GENERATE_DICTIONARY(G__SQL *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(SQLIO LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(SQLIO *.cxx G__SQL.cxx DEPENDENCIES Net RIO )
ROOT_INSTALL_HEADERS()
diff --git a/io/xml/CMakeLists.txt b/io/xml/CMakeLists.txt
index 17731ce041f..45e208c5c80 100644
--- a/io/xml/CMakeLists.txt
+++ b/io/xml/CMakeLists.txt
@@ -5,7 +5,7 @@
ROOT_USE_PACKAGE(io/io)
ROOT_GENERATE_DICTIONARY(G__XML *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(XMLIO LINKDEF LinkDef.h DEPENDENCIES RIO)
+
ROOT_LINKER_LIBRARY(XMLIO *.cxx G__XML.cxx DEPENDENCIES RIO )
ROOT_INSTALL_HEADERS()
diff --git a/io/xmlparser/CMakeLists.txt b/io/xmlparser/CMakeLists.txt
index 886968b615c..22a86bf7131 100644
--- a/io/xmlparser/CMakeLists.txt
+++ b/io/xmlparser/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(${LIBXML2_INCLUDE_DIR})
add_definitions(${LIBXML2_DEFINITIONS})
ROOT_GENERATE_DICTIONARY(G__XMLParser *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(XMLParser LINKDEF LinkDef.h )
+
ROOT_LINKER_LIBRARY(XMLParser *.cxx G__XMLParser.cxx LIBRARIES ${LIBXML2_LIBRARIES} DEPENDENCIES Core)
ROOT_INSTALL_HEADERS()
diff --git a/math/fftw/CMakeLists.txt b/math/fftw/CMakeLists.txt
index f09810fcadb..a1fff14c890 100644
--- a/math/fftw/CMakeLists.txt
+++ b/math/fftw/CMakeLists.txt
@@ -7,6 +7,6 @@ ROOT_USE_PACKAGE(math/mathcore)
include_directories(${FFTW_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__FFTW *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(FFTW LINKDEF LinkDef.h DEPENDENCIES )
+
ROOT_LINKER_LIBRARY(FFTW *.cxx G__FFTW.cxx LIBRARIES Core ${FFTW_LIBRARIES} DEPENDENCIES )
ROOT_INSTALL_HEADERS()
diff --git a/math/genetic/CMakeLists.txt b/math/genetic/CMakeLists.txt
index d2108f2ed86..f3bca177423 100644
--- a/math/genetic/CMakeLists.txt
+++ b/math/genetic/CMakeLists.txt
@@ -7,7 +7,7 @@ ROOT_USE_PACKAGE(math/mathcore)
ROOT_USE_PACKAGE(tmva)
ROOT_GENERATE_DICTIONARY(G__Genetic Math/GeneticMinimizer.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Genetic LINKDEF LinkDef.h DEPENDENCIES RIO Hist Matrix Tree Graf Gpad TreePlayer MLP Minuit MathCore XMLIO TMVA)
+
ROOT_LINKER_LIBRARY(Genetic *.cxx G__Genetic.cxx LIBRARIES Core DEPENDENCIES MathCore TMVA)
ROOT_INSTALL_HEADERS()
diff --git a/math/genvector/CMakeLists.txt b/math/genvector/CMakeLists.txt
index 85d0bc9369f..3d466f564a4 100644
--- a/math/genvector/CMakeLists.txt
+++ b/math/genvector/CMakeLists.txt
@@ -20,13 +20,7 @@ set(headers32 Math/Vector2D.h Math/Point2D.h
ROOT_GENERATE_DICTIONARY(G__${libname} ${headers} LINKDEF Math/LinkDef_GenVector.h)
ROOT_GENERATE_DICTIONARY(G__${libname}32 ${headers32} LINKDEF Math/LinkDef_GenVector32.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF Math/LinkDef_GenVector.h
- Math/LinkDef_Point3D.h
- Math/LinkDef_Vector3D.h
- Math/LinkDef_Vector4D.h
- Math/LinkDef_GenVector2.h
- Math/LinkDef_Rotation.h
- Math/LinkDef_GenVector32.h )
+
ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx G__${libname}32.cxx LIBRARIES Core)
ROOT_INSTALL_HEADERS()
diff --git a/math/mathcore/CMakeLists.txt b/math/mathcore/CMakeLists.txt
index 45d08605997..45e9d009554 100644
--- a/math/mathcore/CMakeLists.txt
+++ b/math/mathcore/CMakeLists.txt
@@ -23,7 +23,7 @@ ROOT_GENERATE_DICTIONARY(G__Math TComplex.h TMath.h LINKDEF LinkDef1.h)
ROOT_GENERATE_DICTIONARY(G__MathCore ${MATHCORE_HEADERS} LINKDEF LinkDef2.h)
ROOT_GENERATE_DICTIONARY(G__MathFit Fit/*.h LINKDEF LinkDef3.h)
-ROOT_GENERATE_ROOTMAP(MathCore LINKDEF LinkDef1.h LinkDef2.h LinkDef3.h LinkDef_Func.h)
+
add_definitions(-DUSE_ROOT_ERROR )
diff --git a/math/mathmore/CMakeLists.txt b/math/mathmore/CMakeLists.txt
index 4e9cf603d76..7a27571bc1a 100644
--- a/math/mathmore/CMakeLists.txt
+++ b/math/mathmore/CMakeLists.txt
@@ -20,7 +20,7 @@ set(headers Math/DistFuncMathMore.h Math/SpecFuncMathMore.h Math/PdfFuncMathMore
set(linkdefs Math/LinkDef.h Math/LinkDef_Func.h Math/LinkDef_RootFinding.h)
ROOT_GENERATE_DICTIONARY(G__MathMore ${headers} LINKDEF Math/LinkDef.h)
-ROOT_GENERATE_ROOTMAP(MathMore LINKDEF ${linkdefs})
+
ROOT_LINKER_LIBRARY(MathMore *.cxx G__MathMore.cxx LIBRARIES ${GSL_LIBRARIES} DEPENDENCIES MathCore)
ROOT_INSTALL_HEADERS()
diff --git a/math/minuit2/CMakeLists.txt b/math/minuit2/CMakeLists.txt
index 8b6b07fd2b4..3d2961ea8e1 100644
--- a/math/minuit2/CMakeLists.txt
+++ b/math/minuit2/CMakeLists.txt
@@ -22,7 +22,7 @@ if($ENV{USE_PARALLEL_MINUIT2})
endif()
ROOT_GENERATE_DICTIONARY(G__Minuit2 *.h Minuit2/*.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Minuit2 LINKDEF LinkDef.h)
+
ROOT_LINKER_LIBRARY(Minuit2 *.cxx G__Minuit2.cxx DEPENDENCIES MathCore Hist)
ROOT_INSTALL_HEADERS()
diff --git a/math/smatrix/CMakeLists.txt b/math/smatrix/CMakeLists.txt
index fdb1f55a2b2..29c40f844ce 100644
--- a/math/smatrix/CMakeLists.txt
+++ b/math/smatrix/CMakeLists.txt
@@ -12,7 +12,7 @@ ROOT_GENERATE_DICTIONARY(G__${libname}32 Math/SMatrix.h Math/SVector.h
Math/SMatrixDfwd.h Math/SMatrixFfwd.h LINKDEF LinkDefD32.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h )
+
ROOT_LINKER_LIBRARY(${libname} G__${libname}.cxx G__${libname}32.cxx LIBRARIES Core)
ROOT_INSTALL_HEADERS()
diff --git a/math/unuran/CMakeLists.txt b/math/unuran/CMakeLists.txt
index 6f40dda557c..64a26aa350c 100644
--- a/math/unuran/CMakeLists.txt
+++ b/math/unuran/CMakeLists.txt
@@ -56,6 +56,6 @@ set(unrsources ${UNR_UNTARDIR}/src/utils/*.c
${UNR_UNTARDIR}/src/urng/*.c )
ROOT_GENERATE_DICTIONARY(G__Unuran *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Unuran LINKDEF LinkDef.h DEPENDENCIES Hist MathCore)
+
ROOT_LINKER_LIBRARY(Unuran *.cxx ${unrsources} G__Unuran.cxx ${UNR_UNTARDIR}/config.h LIBRARIES Core DEPENDENCIES Hist MathCore)
ROOT_INSTALL_HEADERS()
diff --git a/misc/memstat/CMakeLists.txt b/misc/memstat/CMakeLists.txt
index e3b8f7637bb..a89a1517448 100644
--- a/misc/memstat/CMakeLists.txt
+++ b/misc/memstat/CMakeLists.txt
@@ -10,7 +10,7 @@ set(sources TMemStat.cxx TMemStatMng.cxx TMemStatBacktrace.cxx TMemStatHelpers.c
set(headers TMemStatHelpers.h TMemStat.h TMemStatBacktrace.h TMemStatDef.h TMemStatMng.h TMemStatHook.h )
ROOT_GENERATE_DICTIONARY(G__MemStat ${headers} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(MemStat LINKDEF LinkDef.h DEPENDENCIES Tree Gpad Graf)
+
ROOT_LINKER_LIBRARY(MemStat ${sources} G__MemStat.cxx LIBRARIES Core ${CMAKE_DL_LIBS} DEPENDENCIES Tree Gpad Graf)
ROOT_INSTALL_HEADERS()
diff --git a/misc/table/CMakeLists.txt b/misc/table/CMakeLists.txt
index 4feb7de27bd..e7131109593 100644
--- a/misc/table/CMakeLists.txt
+++ b/misc/table/CMakeLists.txt
@@ -8,6 +8,6 @@ ROOT_USE_PACKAGE(io/io)
ROOT_USE_PACKAGE(graf3d/g3d)
ROOT_GENERATE_DICTIONARY(G__Table *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Table LINKDEF LinkDef.h DEPENDENCIES Tree Gpad Graf3d Graf Hist RIO MathCore)
+
ROOT_LINKER_LIBRARY(Table *.cxx G__Table.cxx LIBRARIES Core DEPENDENCIES Tree Gpad Graf3d Graf Hist RIO MathCore)
ROOT_INSTALL_HEADERS()
diff --git a/montecarlo/eg/CMakeLists.txt b/montecarlo/eg/CMakeLists.txt
index 37aadae25dd..422b1be4666 100644
--- a/montecarlo/eg/CMakeLists.txt
+++ b/montecarlo/eg/CMakeLists.txt
@@ -11,7 +11,7 @@ ROOT_USE_PACKAGE(math/mathcore)
ROOT_USE_PACKAGE(math/physics)
ROOT_GENERATE_DICTIONARY(G__${libname} T*.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Graf3d Graf Gpad MathCore )
+
ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx DEPENDENCIES Graf3d Graf Gpad MathCore )
ROOT_INSTALL_HEADERS()
diff --git a/montecarlo/pythia6/CMakeLists.txt b/montecarlo/pythia6/CMakeLists.txt
index 1f6ba98060a..5ac3f59cb0c 100644
--- a/montecarlo/pythia6/CMakeLists.txt
+++ b/montecarlo/pythia6/CMakeLists.txt
@@ -8,7 +8,7 @@ ROOT_USE_PACKAGE(montecarlo/vmc)
ROOT_USE_PACKAGE(math/physics)
ROOT_GENERATE_DICTIONARY(G__Pythia6 *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(EGPythia6 LINKDEF LinkDef.h DEPENDENCIES EG Graf VMC Physics )
+
if(pythia6_nolink)
string(REGEX REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
ROOT_LINKER_LIBRARY(EGPythia6 *.cxx G__Pythia6.cxx LIBRARIES Core DEPENDENCIES EG Graf VMC Physics)
diff --git a/montecarlo/pythia8/CMakeLists.txt b/montecarlo/pythia8/CMakeLists.txt
index 863768fede9..8757f852366 100644
--- a/montecarlo/pythia8/CMakeLists.txt
+++ b/montecarlo/pythia8/CMakeLists.txt
@@ -8,6 +8,6 @@ ROOT_USE_PACKAGE(math/physics)
include_directories(${PYTHIA8_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__Pythia8 *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(EGPythia8 LINKDEF LinkDef.h DEPENDENCIES EG Graf VMC Physics )
+
ROOT_LINKER_LIBRARY(EGPythia8 *.cxx G__Pythia8.cxx LIBRARIES Core ${PYTHIA8_LIBRARIES} DEPENDENCIES EG Graf VMC Physics)
ROOT_INSTALL_HEADERS()
diff --git a/net/alien/CMakeLists.txt b/net/alien/CMakeLists.txt
index f1e484b91bc..a42548e87d4 100644
--- a/net/alien/CMakeLists.txt
+++ b/net/alien/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(${ALIEN_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__Alien *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RAliEn LINKDEF LinkDef.h DEPENDENCIES XMLIO Netx Tree Proof)
+
ROOT_LINKER_LIBRARY(RAliEn *.cxx G__Alien.cxx LIBRARIES ${ALIEN_LIBRARIES}
DEPENDENCIES XMLIO Netx Tree Proof)
diff --git a/net/auth/CMakeLists.txt b/net/auth/CMakeLists.txt
index d9d8769fe89..87109243914 100644
--- a/net/auth/CMakeLists.txt
+++ b/net/auth/CMakeLists.txt
@@ -25,12 +25,11 @@ add_library(rsa STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/rsaaux.cxx
${CMAKE_CURRENT_SOURCE_DIR}/src/rsafun.cxx)
ROOT_GENERATE_DICTIONARY(G__RootAuth ${headers} LINKDEF LinkDefRoot.h)
-ROOT_GENERATE_ROOTMAP(RootAuth LINKDEF LinkDefRoot.h DEPENDENCIES Net RIO )
+
ROOT_LINKER_LIBRARY(RootAuth ${sources} G__RootAuth.cxx LIBRARIES ${CRYPTLIBS} DEPENDENCIES Net RIO )
if(afs)
ROOT_GENERATE_DICTIONARY(G__AFSAuth AFSAuth.h AFSAuthTypes.h TAFS.h LINKDEF LinkDefAFS.h)
- ROOT_GENERATE_ROOTMAP(AFSAuth LINKDEF LinkDefAFS.h DEPENDENCIES Net RIO )
ROOT_LINKER_LIBRARY(AFSAuth AFSAuth.cxx TAFS.cxx G__AFSAuth.cxx LIBRARIES ${CRYPTLIBS} DEPENDENCIES Net RIO )
endif()
diff --git a/net/bonjour/CMakeLists.txt b/net/bonjour/CMakeLists.txt
index 52c23a9d16f..3bcaf7bf77b 100644
--- a/net/bonjour/CMakeLists.txt
+++ b/net/bonjour/CMakeLists.txt
@@ -8,7 +8,7 @@ ROOT_USE_PACKAGE(io/io)
include_directories(${BONJOUR_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__BONJ *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Bonjour LINKDEF LinkDef.h DEPENDENCIES Core)
+
ROOT_LINKER_LIBRARY(Bonjour *.cxx G__BONJ.cxx LIBRARIES ${BONJOUR_LIBRARIES} DEPENDENCIES Core)
ROOT_INSTALL_HEADERS()
diff --git a/net/davix/CMakeLists.txt b/net/davix/CMakeLists.txt
index 3f09ccb0145..a7de0193e2e 100644
--- a/net/davix/CMakeLists.txt
+++ b/net/davix/CMakeLists.txt
@@ -10,7 +10,7 @@ ROOT_USE_PACKAGE(net/net)
include_directories(${DAVIX_INCLUDE_DIRS})
ROOT_GENERATE_DICTIONARY(G__DAVIX *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RDAVIX LINKDEF LinkDef.h DEPENDENCIES RIO Net)
+
ROOT_LINKER_LIBRARY(RDAVIX *.cxx G__DAVIX.cxx LIBRARIES ${DAVIX_LIBRARIES} DEPENDENCIES RIO Net)
add_dependencies(RDAVIX DAVIX)
diff --git a/net/krb5auth/CMakeLists.txt b/net/krb5auth/CMakeLists.txt
index cae32dea50a..72f0ee74a95 100644
--- a/net/krb5auth/CMakeLists.txt
+++ b/net/krb5auth/CMakeLists.txt
@@ -12,7 +12,7 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS R__KRB5INIT="${KRB5_INIT
ROOT_GENERATE_DICTIONARY(G__Krb5Auth TKSocket.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Krb5Auth LINKDEF LinkDef.h DEPENDENCIES RootAuth Net)
+
ROOT_LINKER_LIBRARY(Krb5Auth *.cxx G__Krb5Auth.cxx LIBRARIES ${KRB5_LIBRARIES} ${COMERR_LIBRARIES}
DEPENDENCIES RootAuth Net )
diff --git a/net/ldap/CMakeLists.txt b/net/ldap/CMakeLists.txt
index bc33032e0b8..b5c2e6b3eae 100644
--- a/net/ldap/CMakeLists.txt
+++ b/net/ldap/CMakeLists.txt
@@ -7,6 +7,6 @@ include_directories(${LDAP_INCLUDE_DIRS})
add_definitions(-DLDAP_DEPRECATED)
ROOT_GENERATE_DICTIONARY(G__LDAP *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RLDAP LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(RLDAP *.cxx G__LDAP.cxx LIBRARIES Core ${LDAP_LIBRARIES} DEPENDENCIES Net)
ROOT_INSTALL_HEADERS()
diff --git a/net/monalisa/CMakeLists.txt b/net/monalisa/CMakeLists.txt
index 11909cbc64e..5b767d7d7b4 100644
--- a/net/monalisa/CMakeLists.txt
+++ b/net/monalisa/CMakeLists.txt
@@ -11,7 +11,7 @@ include_directories(${MONALISA_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__Monalisa *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Monalisa LINKDEF LinkDef.h DEPENDENCIES Net RIO MathCore)
+
ROOT_LINKER_LIBRARY(Monalisa *.cxx G__Monalisa.cxx LIBRARIES ${MONALISA_LIBRARIES}
DEPENDENCIES Net RIO MathCore )
diff --git a/net/net/CMakeLists.txt b/net/net/CMakeLists.txt
index dd2ffc91d73..9ca04c0aaad 100644
--- a/net/net/CMakeLists.txt
+++ b/net/net/CMakeLists.txt
@@ -31,7 +31,7 @@ if(MACOSX_MINOR EQUAL 7)
endif()
ROOT_GENERATE_DICTIONARY(G__Net ${headers} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Net LINKDEF LinkDef.h DEPENDENCIES MathCore RIO )
+
ROOT_LINKER_LIBRARY(Net ${sources} G__Net.cxx LIBRARIES ${ssllib} ${CRYPTLIBS} DEPENDENCIES MathCore RIO )
ROOT_INSTALL_HEADERS()
diff --git a/net/netx/CMakeLists.txt b/net/netx/CMakeLists.txt
index afd446da4b9..15a6925a377 100644
--- a/net/netx/CMakeLists.txt
+++ b/net/netx/CMakeLists.txt
@@ -11,7 +11,7 @@ add_definitions(${XROOTD_CFLAGS})
#---------------------------------------------------------------------------
ROOT_GENERATE_DICTIONARY(G__Netx *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Netx LINKDEF LinkDef.h DEPENDENCIES Net RIO Thread)
+
ROOT_LINKER_LIBRARY(Netx *.cxx G__Netx.cxx LIBRARIES ${XROOTD_LIBRARIES} DEPENDENCIES Net RIO Thread)
ROOT_INSTALL_HEADERS()
diff --git a/net/netxng/CMakeLists.txt b/net/netxng/CMakeLists.txt
index 2720c1eb9b5..c1ec235732c 100644
--- a/net/netxng/CMakeLists.txt
+++ b/net/netxng/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(${XROOTD_INCLUDE_DIR})
add_definitions(${XROOTD_CFLAGS})
ROOT_GENERATE_DICTIONARY(G__NetxNG *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(NetxNG LINKDEF LinkDef.h DEPENDENCIES RIO Thread)
+
ROOT_LINKER_LIBRARY(NetxNG *.cxx G__NetxNG.cxx LIBRARIES ${XROOTD_LIBRARIES} DEPENDENCIES RIO Thread)
ROOT_INSTALL_HEADERS()
diff --git a/proof/proof/CMakeLists.txt b/proof/proof/CMakeLists.txt
index 15bfb451f6e..7e4592c915c 100644
--- a/proof/proof/CMakeLists.txt
+++ b/proof/proof/CMakeLists.txt
@@ -27,7 +27,7 @@ if(ROOT_PLATFORM MATCHES "linux" AND CMAKE_COMPILER_IS_GNUCXX AND
endif()
ROOT_GENERATE_DICTIONARY(G__Proof ${headers} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Proof LINKDEF LinkDef.h DEPENDENCIES Net Tree Thread RIO MathCore)
+
ROOT_LINKER_LIBRARY(Proof ${sources} G__Proof.cxx DEPENDENCIES Net Tree Thread RIO MathCore)
ROOT_INSTALL_HEADERS()
diff --git a/proof/proofbench/CMakeLists.txt b/proof/proofbench/CMakeLists.txt
index c1923d850d9..a57759f9413 100644
--- a/proof/proofbench/CMakeLists.txt
+++ b/proof/proofbench/CMakeLists.txt
@@ -9,6 +9,6 @@ ROOT_GLOB_HEADERS(headers inc/TProof*.h)
ROOT_GLOB_SOURCES(sources src/TProof*.cxx)
ROOT_GENERATE_DICTIONARY(G__ProofBench ${headers} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(ProofBench LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(ProofBench ${sources} G__ProofBench.cxx LIBRARIES Core DEPENDENCIES Hist Gpad ProofPlayer)
ROOT_INSTALL_HEADERS()
diff --git a/proof/proofplayer/CMakeLists.txt b/proof/proofplayer/CMakeLists.txt
index 15cb9321801..ea75d23cdd9 100644
--- a/proof/proofplayer/CMakeLists.txt
+++ b/proof/proofplayer/CMakeLists.txt
@@ -16,11 +16,11 @@ list(REMOVE_ITEM sources ${CMAKE_CURRENT_SOURCE_DIR}/src/TProofDraw.cxx)
ROOT_GENERATE_DICTIONARY(G__ProofPlayer ${headers} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(ProofPlayer LINKDEF LinkDef.h DEPENDENCIES Proof Hist RIO Tree Net Thread MathCore)
+
ROOT_LINKER_LIBRARY(ProofPlayer ${sources} G__ProofPlayer.cxx DEPENDENCIES Proof Hist RIO Tree Net Thread MathCore)
ROOT_GENERATE_DICTIONARY(G__ProofDraw TProofDraw.h LINKDEF LinkDefDraw.h)
-ROOT_GENERATE_ROOTMAP(ProofDraw LINKDEF LinkDefDraw.h DEPENDENCIES ProofPlayer TreePlayer)
+
ROOT_LINKER_LIBRARY(ProofDraw TProofDraw.cxx G__ProofDraw.cxx DEPENDENCIES ProofPlayer TreePlayer)
ROOT_INSTALL_HEADERS()
diff --git a/proof/proofx/CMakeLists.txt b/proof/proofx/CMakeLists.txt
index f953fd4a1bf..33edcf15410 100644
--- a/proof/proofx/CMakeLists.txt
+++ b/proof/proofx/CMakeLists.txt
@@ -21,7 +21,7 @@ link_directories(${XROOTD_LIBRARY_DIR})
add_definitions(${XROOTD_CFLAGS})
ROOT_GENERATE_DICTIONARY(G__Proofx ${headers} LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Proofx LINKDEF LinkDef.h DEPENDENCIES Net Proof Thread)
+
ROOT_LINKER_LIBRARY(Proofx ${sources} G__Proofx.cxx LIBRARIES ${XROOTD_LIBRARIES} XrdProofd DEPENDENCIES Net Proof Thread )
ROOT_INSTALL_HEADERS()
diff --git a/roofit/histfactory/CMakeLists.txt b/roofit/histfactory/CMakeLists.txt
index c7eeb4d6f2b..5a2c5ba5942 100644
--- a/roofit/histfactory/CMakeLists.txt
+++ b/roofit/histfactory/CMakeLists.txt
@@ -7,8 +7,7 @@ ROOT_USE_PACKAGE(io/xmlparser)
ROOT_GENERATE_DICTIONARY(G__HistFactory RooStats/HistFactory/*.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(HistFactory LINKDEF LinkDef.h
- DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad RooStats XMLParser )
+
ROOT_LINKER_LIBRARY(HistFactory *.cxx G__HistFactory.cxx LIBRARIES Core
DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad RooStats XMLParser)
diff --git a/roofit/roofit/CMakeLists.txt b/roofit/roofit/CMakeLists.txt
index 3c47c44e696..8465c647c18 100644
--- a/roofit/roofit/CMakeLists.txt
+++ b/roofit/roofit/CMakeLists.txt
@@ -4,8 +4,7 @@
############################################################################
ROOT_GENERATE_DICTIONARY(G__RooFit *.h LINKDEF LinkDef1.h)
-ROOT_GENERATE_ROOTMAP(RooFit LINKDEF LinkDef1.h
- DEPENDENCIES RooFitCore Tree RIO Matrix MathCore ${ROOT_MATHMORE_LIBRARY} )
+
ROOT_LINKER_LIBRARY(RooFit *.cxx G__RooFit.cxx LIBRARIES Core
DEPENDENCIES RooFitCore Tree RIO Matrix MathCore ${ROOT_MATHMORE_LIBRARY} )
ROOT_INSTALL_HEADERS()
diff --git a/roofit/roostats/CMakeLists.txt b/roofit/roostats/CMakeLists.txt
index 4741c0ddda4..76bb6f39ff7 100644
--- a/roofit/roostats/CMakeLists.txt
+++ b/roofit/roostats/CMakeLists.txt
@@ -4,8 +4,7 @@
############################################################################
ROOT_GENERATE_DICTIONARY(G__RooStats RooStats/*.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RooStats LINKDEF LinkDef.h
- DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad )
+
ROOT_LINKER_LIBRARY(RooStats *.cxx G__RooStats.cxx LIBRARIES Core
DEPENDENCIES RooFit RooFitCore Tree RIO Hist Matrix MathCore Minuit Foam Graf Gpad )
diff --git a/sql/mysql/CMakeLists.txt b/sql/mysql/CMakeLists.txt
index 87b84309228..15781baff18 100644
--- a/sql/mysql/CMakeLists.txt
+++ b/sql/mysql/CMakeLists.txt
@@ -8,6 +8,6 @@ ROOT_USE_PACKAGE(net/net)
include_directories(${MYSQL_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__MySQL *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RMySQL LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(RMySQL *.cxx G__MySQL.cxx LIBRARIES Core ${MYSQL_LIBRARIES} DEPENDENCIES Net RIO)
ROOT_INSTALL_HEADERS()
diff --git a/sql/odbc/CMakeLists.txt b/sql/odbc/CMakeLists.txt
index a477252a4e6..ca7257f1472 100644
--- a/sql/odbc/CMakeLists.txt
+++ b/sql/odbc/CMakeLists.txt
@@ -8,6 +8,6 @@ ROOT_USE_PACKAGE(net/net)
include_directories(${ODBC_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__ODBC *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RODBC LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(RODBC *.cxx G__ODBC.cxx LIBRARIES Core ${ODBC_LIBRARIES} DEPENDENCIES Net RIO)
ROOT_INSTALL_HEADERS()
diff --git a/sql/oracle/CMakeLists.txt b/sql/oracle/CMakeLists.txt
index 034958e58ae..082c763bd56 100644
--- a/sql/oracle/CMakeLists.txt
+++ b/sql/oracle/CMakeLists.txt
@@ -8,6 +8,6 @@ ROOT_USE_PACKAGE(net/net)
include_directories(${ORACLE_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__Oracle *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(Oracle LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(Oracle *.cxx G__Oracle.cxx LIBRARIES Core ${ORACLE_LIBRARIES} DEPENDENCIES Net RIO)
ROOT_INSTALL_HEADERS()
diff --git a/sql/pgsql/CMakeLists.txt b/sql/pgsql/CMakeLists.txt
index 6e10b2af300..10cfb9e0324 100644
--- a/sql/pgsql/CMakeLists.txt
+++ b/sql/pgsql/CMakeLists.txt
@@ -8,6 +8,6 @@ ROOT_USE_PACKAGE(net/net)
include_directories(${POSTGRESQL_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__PgSQL *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RPgSQL LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(RPgSQL *.cxx G__PgSQL.cxx LIBRARIES Core ${POSTGRESQL_LIBRARIES} DEPENDENCIES Net RIO)
ROOT_INSTALL_HEADERS()
diff --git a/sql/sqlite/CMakeLists.txt b/sql/sqlite/CMakeLists.txt
index 63c01ba1729..462bcd1d4ac 100644
--- a/sql/sqlite/CMakeLists.txt
+++ b/sql/sqlite/CMakeLists.txt
@@ -8,6 +8,6 @@ ROOT_USE_PACKAGE(net/net)
include_directories(${SQLITE_INCLUDE_DIR})
ROOT_GENERATE_DICTIONARY(G__SQLite *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(RSQLite LINKDEF LinkDef.h DEPENDENCIES Net RIO)
+
ROOT_LINKER_LIBRARY(RSQLite *.cxx G__SQLite.cxx LIBRARIES Core ${SQLITE_LIBRARIES} DEPENDENCIES Net RIO)
ROOT_INSTALL_HEADERS()
diff --git a/tmva/CMakeLists.txt b/tmva/CMakeLists.txt
index cb25ec5072a..750637ea7a0 100644
--- a/tmva/CMakeLists.txt
+++ b/tmva/CMakeLists.txt
@@ -55,8 +55,7 @@ ROOT_GENERATE_DICTIONARY(G__TMVA2 ${theaders2} LINKDEF LinkDef2.h)
ROOT_GENERATE_DICTIONARY(G__TMVA3 ${theaders3} LINKDEF LinkDef3.h)
ROOT_GENERATE_DICTIONARY(G__TMVA4 ${theaders4} LINKDEF LinkDef4.h)
-ROOT_GENERATE_ROOTMAP(TMVA LINKDEF LinkDef1.h LinkDef2.h LinkDef3.h LinkDef4.h
- DEPENDENCIES RIO Hist Matrix Tree Graf Gpad TreePlayer MLP Minuit MathCore XMLIO)
+
ROOT_LINKER_LIBRARY(TMVA *.cxx G__TMVA1.cxx G__TMVA2.cxx G__TMVA3.cxx G__TMVA4.cxx LIBRARIES Core
DEPENDENCIES RIO Hist Tree MLP Minuit XMLIO)
diff --git a/tree/tree/CMakeLists.txt b/tree/tree/CMakeLists.txt
index 3c44b21415b..1f96147a8c4 100644
--- a/tree/tree/CMakeLists.txt
+++ b/tree/tree/CMakeLists.txt
@@ -15,7 +15,7 @@ ROOT_USE_PACKAGE(hist/hist)
ROOT_GENERATE_DICTIONARY(G__${libname} *.h LINKDEF LinkDef.h)
#ROOT_GENERATE_DICTIONARY(ManualTree TTree.h LINKDEF LinkDef2.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Net RIO Thread )
+
ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx DEPENDENCIES Net RIO Thread)
ROOT_INSTALL_HEADERS()
diff --git a/tree/treeplayer/CMakeLists.txt b/tree/treeplayer/CMakeLists.txt
index 3241370eeaf..f4e96fa7983 100644
--- a/tree/treeplayer/CMakeLists.txt
+++ b/tree/treeplayer/CMakeLists.txt
@@ -11,7 +11,7 @@ ROOT_USE_PACKAGE(graf3d/g3d)
ROOT_GENERATE_DICTIONARY(G__${libname} *.h LINKDEF LinkDef.h)
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF LinkDef.h DEPENDENCIES Tree Graf3d Graf Hist Gpad RIO MathCore )
+
ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx DEPENDENCIES Tree Graf3d Graf Hist Gpad RIO MathCore)
ROOT_INSTALL_HEADERS()
diff --git a/tree/treeviewer/CMakeLists.txt b/tree/treeviewer/CMakeLists.txt
index 5b8e7d804b3..595d998a658 100644
--- a/tree/treeviewer/CMakeLists.txt
+++ b/tree/treeviewer/CMakeLists.txt
@@ -23,7 +23,7 @@ endif()
ROOT_GENERATE_DICTIONARY(G__${libname} ${headers} LINKDEF ${linkdef})
-ROOT_GENERATE_ROOTMAP(${libname} LINKDEF ${linkdef} DEPENDENCIES Tree Gpad Graf Hist Gui TreePlayer Ged RIO MathCore)
+
ROOT_LINKER_LIBRARY(${libname} ${sources} G__${libname}.cxx LIBRARIES TreePlayer DEPENDENCIES Gui Ged)
ROOT_INSTALL_HEADERS()
--
GitLab