diff --git a/bindings/pyroot/CMakeLists.txt b/bindings/pyroot/CMakeLists.txt index d2806128ea460..6bd1b1c4a8b7b 100644 --- a/bindings/pyroot/CMakeLists.txt +++ b/bindings/pyroot/CMakeLists.txt @@ -1,8 +1,6 @@ ############################################################################ # CMakeLists.txt file for building ROOT bindings/pyroot package ############################################################################ -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(tree/tree) include_directories(${PYTHON_INCLUDE_DIRS}) ROOT_GENERATE_DICTIONARY(G__PyROOT *.h MODULE PyROOT LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/bindings/ruby/CMakeLists.txt b/bindings/ruby/CMakeLists.txt index e1d7d2bf162dd..95604a47cc9f3 100644 --- a/bindings/ruby/CMakeLists.txt +++ b/bindings/ruby/CMakeLists.txt @@ -1,8 +1,6 @@ ############################################################################ # CMakeLists.txt file for building ROOT bindings/ruby package ############################################################################ -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(tree/tree) include_directories(${RUBY_INCLUDE_DIRS}) ROOT_GENERATE_DICTIONARY(G__Ruby *.h MODULE Ruby LINKDEF LinkDef.h) diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake index 0d59753039c04..71a1fc9716fcc 100644 --- a/cmake/modules/RootNewMacros.cmake +++ b/cmake/modules/RootNewMacros.cmake @@ -520,12 +520,6 @@ function(ROOT_MODULE_LIBRARY library) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) endfunction() -#--------------------------------------------------------------------------------------------------- -#---ROOT_USE_PACKAGE( package ) -#--------------------------------------------------------------------------------------------------- -macro( ROOT_USE_PACKAGE package ) -endmacro() - #--------------------------------------------------------------------------------------------------- #---ROOT_GENERATE_ROOTMAP( library LINKDEF linkdef LIBRRARY lib DEPENDENCIES lib1 lib2 ) #--------------------------------------------------------------------------------------------------- diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 37d8ed31000f0..bd34cac6ca66c 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -2,19 +2,6 @@ # CMakeLists.txt file for building ROOT (global) core package ############################################################################ -ROOT_USE_PACKAGE(core/base) -ROOT_USE_PACKAGE(core/clib) -ROOT_USE_PACKAGE(core/cont) -ROOT_USE_PACKAGE(core/meta) -ROOT_USE_PACKAGE(core/metautils) -ROOT_USE_PACKAGE(core/textinput) -ROOT_USE_PACKAGE(core/thread) -ROOT_USE_PACKAGE(core/unix) -ROOT_USE_PACKAGE(core/winnt) -ROOT_USE_PACKAGE(core/macosx) -ROOT_USE_PACKAGE(core/zip) -ROOT_USE_PACKAGE(core/lzma) - if(builtin_pcre) add_subdirectory(pcre) endif() diff --git a/core/newdelete/CMakeLists.txt b/core/newdelete/CMakeLists.txt index 1e630dcdf1401..04fb54e07032e 100644 --- a/core/newdelete/CMakeLists.txt +++ b/core/newdelete/CMakeLists.txt @@ -2,7 +2,6 @@ # CMakeLists.txt file for building ROOT core/newdelete package ############################################################################ -ROOT_USE_PACKAGE(io/io) ROOT_LINKER_LIBRARY(New *.cxx DEPENDENCIES Core) ROOT_INSTALL_HEADERS() diff --git a/core/rint/CMakeLists.txt b/core/rint/CMakeLists.txt index 8b4060895a65e..692ea5922793f 100644 --- a/core/rint/CMakeLists.txt +++ b/core/rint/CMakeLists.txt @@ -1,7 +1,6 @@ ############################################################################ # CMakeLists.txt file for building ROOT core/rint package ############################################################################ -ROOT_USE_PACKAGE(core) ROOT_GENERATE_DICTIONARY(G__Rint *.h STAGE1 MODULE Rint LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/core/thread/CMakeLists.txt b/core/thread/CMakeLists.txt index 4f76ad8143aa5..c25284bb28ca3 100644 --- a/core/thread/CMakeLists.txt +++ b/core/thread/CMakeLists.txt @@ -1,7 +1,6 @@ ############################################################################ # CMakeLists.txt file for building ROOT core/thread package ############################################################################ -ROOT_USE_PACKAGE(core) set(headers TCondition.h TConditionImp.h TMutex.h TMutexImp.h TRWLock.h TSemaphore.h TThread.h TThreadFactory.h diff --git a/core/utils/CMakeLists.txt b/core/utils/CMakeLists.txt index 19bcaf0ac67a1..aafa427e36296 100644 --- a/core/utils/CMakeLists.txt +++ b/core/utils/CMakeLists.txt @@ -1,9 +1,6 @@ ############################################################################ # CMakeLists.txt file for building ROOT core/utils package ############################################################################ -ROOT_USE_PACKAGE(core/metautils) -ROOT_USE_PACKAGE(io/io) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/../metautils/src ${LLVM_INCLUDE_DIRS} ${CLING_INCLUDE_DIRS}) if(NOT MSVC) diff --git a/geom/gdml/CMakeLists.txt b/geom/gdml/CMakeLists.txt index 6c601a1b9e7dc..005d880dd7a6a 100644 --- a/geom/gdml/CMakeLists.txt +++ b/geom/gdml/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT geom/gdml package ############################################################################ -ROOT_USE_PACKAGE(geom/geom) -ROOT_USE_PACKAGE(io/xml) - ROOT_GENERATE_DICTIONARY(G__Gdml *.h MODULE Gdml LINKDEF LinkDef.h) ROOT_LINKER_LIBRARY(Gdml *.cxx G__Gdml.cxx DEPENDENCIES Geom XMLIO Hist RIO) diff --git a/geom/geom/CMakeLists.txt b/geom/geom/CMakeLists.txt index bc97d753d5860..04ff2b2fa0671 100644 --- a/geom/geom/CMakeLists.txt +++ b/geom/geom/CMakeLists.txt @@ -4,10 +4,6 @@ set(libname Geom) -ROOT_USE_PACKAGE(math) -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(hist/hist) - set(headers1 TGeoAtt.h TGeoStateInfo.h TGeoBoolNode.h TGeoMedium.h TGeoMaterial.h TGeoMatrix.h TGeoVolume.h TGeoNode.h diff --git a/geom/geombuilder/CMakeLists.txt b/geom/geombuilder/CMakeLists.txt index 88e467ccac0cb..d573242ed2fa7 100644 --- a/geom/geombuilder/CMakeLists.txt +++ b/geom/geombuilder/CMakeLists.txt @@ -5,10 +5,6 @@ set(libname GeomBuilder) -ROOT_USE_PACKAGE(geom/geom) -ROOT_USE_PACKAGE(gui/gui) -ROOT_USE_PACKAGE(gui/ged) - set(headers TGeoVolumeEditor.h TGeoBBoxEditor.h TGeoMediumEditor.h TGeoNodeEditor.h TGeoMatrixEditor.h TGeoManagerEditor.h TGeoTubeEditor.h TGeoConeEditor.h TGeoTrd1Editor.h diff --git a/geom/geompainter/CMakeLists.txt b/geom/geompainter/CMakeLists.txt index c3bc4a50a025f..91c46e30ef23c 100644 --- a/geom/geompainter/CMakeLists.txt +++ b/geom/geompainter/CMakeLists.txt @@ -5,11 +5,6 @@ set(libname GeomPainter) -ROOT_USE_PACKAGE(geom/geom) -ROOT_USE_PACKAGE(graf3d/g3d) -ROOT_USE_PACKAGE(tree/tree) - - ROOT_GENERATE_DICTIONARY(G__${libname} T*.h MODULE ${libname} LINKDEF LinkDef.h) diff --git a/graf2d/CMakeLists.txt b/graf2d/CMakeLists.txt index 27a23bc779d55..e27a99d9db9d8 100644 --- a/graf2d/CMakeLists.txt +++ b/graf2d/CMakeLists.txt @@ -1,6 +1,3 @@ -ROOT_USE_PACKAGE(graf2d/gpad) -ROOT_USE_PACKAGE(graf2d/graf) - if(builtin_freetype) add_subdirectory(freetype) endif() diff --git a/graf2d/asimage/CMakeLists.txt b/graf2d/asimage/CMakeLists.txt index c1c3fcdf754a1..595e1273f314b 100644 --- a/graf2d/asimage/CMakeLists.txt +++ b/graf2d/asimage/CMakeLists.txt @@ -19,9 +19,6 @@ if(cocoa) # Not needed to locate PNG, JPG, TIFF libraries endif() #---Build ASImage/ASImageGui libraries--------------------------------------- -ROOT_USE_PACKAGE(graf2d/graf) -ROOT_USE_PACKAGE(graf2d/x11) -ROOT_USE_PACKAGE(gui/gui) include_directories(${CMAKE_SOURCE_DIR}/hist/hist/inc) # This is to avoid a circular dependency graf <--> hist include_directories(${FREETYPE_INCLUDE_DIRS} ${AFTERIMAGE_INCLUDE_DIR} ${X11_INCLUDE_DIR}) diff --git a/graf2d/cocoa/CMakeLists.txt b/graf2d/cocoa/CMakeLists.txt index 0e0c0de3fb79b..8e18a25283553 100644 --- a/graf2d/cocoa/CMakeLists.txt +++ b/graf2d/cocoa/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(graf2d/quartz) -ROOT_USE_PACKAGE(gui/gui) - add_definitions("-ObjC++") include_directories(${FREETYPE_INCLUDE_DIRS}) diff --git a/graf2d/fitsio/CMakeLists.txt b/graf2d/fitsio/CMakeLists.txt index 6b8e9a2db2d15..9ffeab82553d8 100644 --- a/graf2d/fitsio/CMakeLists.txt +++ b/graf2d/fitsio/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(graf2d/graf) -ROOT_USE_PACKAGE(hist/hist) - include_directories(${CFITSIO_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__FITSIO *.h MODULE FITSIO LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/graf2d/gpad/CMakeLists.txt b/graf2d/gpad/CMakeLists.txt index 2b865735774c5..1f04087dbeeeb 100644 --- a/graf2d/gpad/CMakeLists.txt +++ b/graf2d/gpad/CMakeLists.txt @@ -3,8 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(graf2d/graf) -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 MODULE Gpad LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/graf2d/graf/CMakeLists.txt b/graf2d/graf/CMakeLists.txt index bb9bc7f7d6edc..dc4700fe7cb9e 100644 --- a/graf2d/graf/CMakeLists.txt +++ b/graf2d/graf/CMakeLists.txt @@ -5,10 +5,6 @@ set(libname Graf) -ROOT_USE_PACKAGE(core) -ROOT_USE_PACKAGE(math/matrix) -ROOT_USE_PACKAGE(io/io) -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} MODULE ${libname} *.h LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/graf2d/gviz/CMakeLists.txt b/graf2d/gviz/CMakeLists.txt index bda84da4c0eec..ffaea04c542b9 100644 --- a/graf2d/gviz/CMakeLists.txt +++ b/graf2d/gviz/CMakeLists.txt @@ -3,10 +3,6 @@ # @author Pere Mato, CERN ############################################################################ - -ROOT_USE_PACKAGE(hist/hist) -ROOT_USE_PACKAGE(graf2d/graf) - include_directories(${GRAPHVIZ_INCLUDE_DIR}/graphviz) ROOT_GENERATE_DICTIONARY(G__Gviz *.h MODULE Gviz LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/graf2d/postscript/CMakeLists.txt b/graf2d/postscript/CMakeLists.txt index 33759b760ecbf..e4c48a1a5ebb2 100644 --- a/graf2d/postscript/CMakeLists.txt +++ b/graf2d/postscript/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(graf2d/graf) -ROOT_USE_PACKAGE(graf2d/mathtext) - ROOT_GENERATE_DICTIONARY(G__PostScript *.h MODULE Postscript LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") ROOT_LINKER_LIBRARY(Postscript *.cxx G__PostScript.cxx LIBRARIES ${ZLIB_LIBRARY} mathtext DEPENDENCIES Graf) diff --git a/graf2d/qt/CMakeLists.txt b/graf2d/qt/CMakeLists.txt index f81a6ac1e6a75..e3be2d6f41041 100644 --- a/graf2d/qt/CMakeLists.txt +++ b/graf2d/qt/CMakeLists.txt @@ -3,7 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(gui/gui) include(${QT_USE_FILE}) set(headers TGQt.h TQtTimer.h TQtApplication.h TQtBrush.h diff --git a/graf2d/win32gdk/CMakeLists.txt b/graf2d/win32gdk/CMakeLists.txt index abe65398b0bc3..63947ccb58025 100644 --- a/graf2d/win32gdk/CMakeLists.txt +++ b/graf2d/win32gdk/CMakeLists.txt @@ -2,7 +2,6 @@ # CMakeLists.txt file for building ROOT graf2d/win32gdk package # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(gui/gui) include_directories(${FREETYPE_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/gdk/src ${CMAKE_CURRENT_SOURCE_DIR}/gdk/src/gdk ${CMAKE_CURRENT_BINARY_DIR}/gdk/src/glib) diff --git a/graf2d/x11/CMakeLists.txt b/graf2d/x11/CMakeLists.txt index c044d93b6e38a..e13d71122dcc9 100644 --- a/graf2d/x11/CMakeLists.txt +++ b/graf2d/x11/CMakeLists.txt @@ -4,7 +4,6 @@ ############################################################################ set(libname GX11) -ROOT_USE_PACKAGE(core) include_directories(${X11_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__${libname} T*.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/graf2d/x11ttf/CMakeLists.txt b/graf2d/x11ttf/CMakeLists.txt index d7bf7e6ce27c4..cf2385e8a1e06 100644 --- a/graf2d/x11ttf/CMakeLists.txt +++ b/graf2d/x11ttf/CMakeLists.txt @@ -4,8 +4,6 @@ ############################################################################ set(libname GX11TTF) -ROOT_USE_PACKAGE(graf2d/graf) -ROOT_USE_PACKAGE(graf2d/x11) include_directories(${FREETYPE_INCLUDE_DIRS} ${X11_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__${libname} *.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/graf3d/eve/CMakeLists.txt b/graf3d/eve/CMakeLists.txt index cddd820342976..c4fca4dae52ec 100644 --- a/graf3d/eve/CMakeLists.txt +++ b/graf3d/eve/CMakeLists.txt @@ -2,13 +2,6 @@ # CMakeLists.txt file for building ROOT graf3d/eve package ############################################################################ -ROOT_USE_PACKAGE(gui/ged) -ROOT_USE_PACKAGE(graf3d/gl) -ROOT_USE_PACKAGE(geom/geom) -ROOT_USE_PACKAGE(math/physics) -ROOT_USE_PACKAGE(montecarlo/eg) -ROOT_USE_PACKAGE(graf3d/glew) - include_directories(${OPENGL_INCLUDE_DIR}) set(headers1 TEveBrowser.h TEveChunkManager.h TEveCompound.h diff --git a/graf3d/g3d/CMakeLists.txt b/graf3d/g3d/CMakeLists.txt index a769d553a219e..6bfe9c23c1082 100644 --- a/graf3d/g3d/CMakeLists.txt +++ b/graf3d/g3d/CMakeLists.txt @@ -4,8 +4,6 @@ set(libname Graf3d) -ROOT_USE_PACKAGE(hist/hist) - ROOT_GLOB_HEADERS(headers1 ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h) list(REMOVE_ITEM headers1 ${CMAKE_CURRENT_SOURCE_DIR}/inc/X3DBuffer.h) set(headers2 X3DBuffer.h ) diff --git a/graf3d/gl/CMakeLists.txt b/graf3d/gl/CMakeLists.txt index 734e50148fbe7..4a43d0c8b5bba 100644 --- a/graf3d/gl/CMakeLists.txt +++ b/graf3d/gl/CMakeLists.txt @@ -1,10 +1,6 @@ ############################################################################ # CMakeLists.txt file for building ROOT graf3d/gl package ############################################################################ -ROOT_USE_PACKAGE(gui/ged) -if(builtin_glew) - ROOT_USE_PACKAGE(graf3d/glew) -endif() include_directories(${OPENGL_INCLUDE_DIR} ${FTGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}) diff --git a/graf3d/gviz3d/CMakeLists.txt b/graf3d/gviz3d/CMakeLists.txt index bef329d56c68d..31355631724fa 100644 --- a/graf3d/gviz3d/CMakeLists.txt +++ b/graf3d/gviz3d/CMakeLists.txt @@ -2,11 +2,6 @@ # CMakeLists.txt file for building ROOT graf3d/gviz3d package ############################################################################ -ROOT_USE_PACKAGE(gui/gui) -ROOT_USE_PACKAGE(gui/ged) -ROOT_USE_PACKAGE(graf3d/gl) -ROOT_USE_PACKAGE(geom/geom) - ROOT_GENERATE_DICTIONARY(G__Gviz3d *.h MODULE Gviz3d LINKDEF LinkDef.h) ROOT_LINKER_LIBRARY(Gviz3d *.cxx G__Gviz3d.cxx LIBRARIES GLEW ${FTGL_LIBRARIES} DEPENDENCIES Gui Ged Geom RGL) diff --git a/graf3d/x3d/CMakeLists.txt b/graf3d/x3d/CMakeLists.txt index 1340635fc48de..de55fc2930eb3 100644 --- a/graf3d/x3d/CMakeLists.txt +++ b/graf3d/x3d/CMakeLists.txt @@ -4,8 +4,6 @@ set(libname X3d) -ROOT_USE_PACKAGE(graf3d/g3d) -ROOT_USE_PACKAGE(gui/gui) include_directories(${X11_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__X3D TViewerX3D.h TX3DFrame.h MODULE ${libname} LINKDEF LinkDef.h) diff --git a/gui/fitpanel/CMakeLists.txt b/gui/fitpanel/CMakeLists.txt index e89a7b1abe05c..e07c180dfd329 100644 --- a/gui/fitpanel/CMakeLists.txt +++ b/gui/fitpanel/CMakeLists.txt @@ -2,8 +2,5 @@ # CMakeLists.txt file for building ROOT gui/fitpanel package ############################################################################ -ROOT_USE_PACKAGE(gui/gui) -ROOT_USE_PACKAGE(tree/treeplayer) - ROOT_STANDARD_LIBRARY_PACKAGE(FitPanel DEPENDENCIES Gui Gpad Hist Graf Tree MathCore DICTIONARY_OPTIONS "-writeEmptyRootPCM") diff --git a/gui/ged/CMakeLists.txt b/gui/ged/CMakeLists.txt index b74de26d879b7..1fd4c337e1da0 100644 --- a/gui/ged/CMakeLists.txt +++ b/gui/ged/CMakeLists.txt @@ -2,8 +2,5 @@ # CMakeLists.txt file for building ROOT gui/ged package ############################################################################ -ROOT_USE_PACKAGE(gui/gui) -ROOT_USE_PACKAGE(tree/treeplayer) - ROOT_STANDARD_LIBRARY_PACKAGE(Ged DEPENDENCIES Hist Gpad Graf Gui Tree TreePlayer) diff --git a/gui/gui/CMakeLists.txt b/gui/gui/CMakeLists.txt index 6213541f5334b..a519250f38588 100644 --- a/gui/gui/CMakeLists.txt +++ b/gui/gui/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT gui/gui package ############################################################################ -ROOT_USE_PACKAGE(hist/hist) -ROOT_USE_PACKAGE(net/net) -ROOT_USE_PACKAGE(core/rint) include_directories(${CMAKE_SOURCE_DIR}/gui/ged/inc) set(libname Gui) diff --git a/gui/guibuilder/CMakeLists.txt b/gui/guibuilder/CMakeLists.txt index ce7e97371b4dd..c17ace575754d 100644 --- a/gui/guibuilder/CMakeLists.txt +++ b/gui/guibuilder/CMakeLists.txt @@ -2,8 +2,5 @@ # CMakeLists.txt file for building ROOT gui/guibuilder package ############################################################################ -ROOT_USE_PACKAGE(gui/gui) -ROOT_USE_PACKAGE(tree/treeplayer) - ROOT_STANDARD_LIBRARY_PACKAGE(GuiBld DEPENDENCIES Gui Graf MathCore) diff --git a/gui/guihtml/CMakeLists.txt b/gui/guihtml/CMakeLists.txt index 8dc8186e53972..1dc108ad7c208 100644 --- a/gui/guihtml/CMakeLists.txt +++ b/gui/guihtml/CMakeLists.txt @@ -2,8 +2,5 @@ # CMakeLists.txt file for building ROOT gui/guihtml package ############################################################################ -ROOT_USE_PACKAGE(gui/gui) -ROOT_USE_PACKAGE(net/net) - ROOT_STANDARD_LIBRARY_PACKAGE(GuiHtml DEPENDENCIES Gui Graf Net) diff --git a/gui/qtgsi/CMakeLists.txt b/gui/qtgsi/CMakeLists.txt index d60131395807b..1c366d631f4b0 100644 --- a/gui/qtgsi/CMakeLists.txt +++ b/gui/qtgsi/CMakeLists.txt @@ -3,8 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(gui/gui) - include(${QT_USE_FILE}) add_definitions(-DQT3_SUPPORT= -DQT3_SUPPORT_CONSTRUCTOR= -DQT_DLL -DQT_THREAD_SUPPORT) include_directories(${QT_QT3SUPPORT_INCLUDE_DIR}) diff --git a/gui/qtroot/CMakeLists.txt b/gui/qtroot/CMakeLists.txt index 57df01ee9d05e..7096f7ef5bd61 100644 --- a/gui/qtroot/CMakeLists.txt +++ b/gui/qtroot/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(gui/gui) -ROOT_USE_PACKAGE(graf2d/qt) - include(${QT_USE_FILE}) if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/gui/recorder/CMakeLists.txt b/gui/recorder/CMakeLists.txt index 083de08d8acbc..a3862ea489727 100644 --- a/gui/recorder/CMakeLists.txt +++ b/gui/recorder/CMakeLists.txt @@ -2,8 +2,5 @@ # CMakeLists.txt file for building ROOT gui/recorder package ############################################################################ -ROOT_USE_PACKAGE(gui/gui) -ROOT_USE_PACKAGE(tree/tree) - ROOT_STANDARD_LIBRARY_PACKAGE(Recorder DEPENDENCIES RIO Tree Gui Thread) diff --git a/gui/sessionviewer/CMakeLists.txt b/gui/sessionviewer/CMakeLists.txt index 2c8a0a90bbb37..2fdac529cf20d 100644 --- a/gui/sessionviewer/CMakeLists.txt +++ b/gui/sessionviewer/CMakeLists.txt @@ -2,10 +2,6 @@ # CMakeLists.txt file for building ROOT gui/sessionviewer package ############################################################################ -ROOT_USE_PACKAGE(gui/gui) -ROOT_USE_PACKAGE(tree/treeplayer) -ROOT_USE_PACKAGE(proof/proof) - ROOT_STANDARD_LIBRARY_PACKAGE(SessionViewer DEPENDENCIES Proof Gui Hist Gpad Graf Tree MathCore) diff --git a/hist/hbook/CMakeLists.txt b/hist/hbook/CMakeLists.txt index a662b6d498ed2..c78b44a277112 100644 --- a/hist/hbook/CMakeLists.txt +++ b/hist/hbook/CMakeLists.txt @@ -4,9 +4,6 @@ set(libname Hbook) -ROOT_USE_PACKAGE(hist/hist) -ROOT_USE_PACKAGE(tree/treeplayer) - ROOT_GENERATE_DICTIONARY(G__${libname} *.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx DEPENDENCIES Hist Matrix Tree Graf TreePlayer RIO minicern ) diff --git a/hist/hist/CMakeLists.txt b/hist/hist/CMakeLists.txt index eb256df60f7c2..6d9fce6d0ea98 100644 --- a/hist/hist/CMakeLists.txt +++ b/hist/hist/CMakeLists.txt @@ -4,10 +4,6 @@ set(libname Hist) -ROOT_USE_PACKAGE(core) -ROOT_USE_PACKAGE(math) -ROOT_USE_PACKAGE(graf2d) -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 v5/*.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/hist/histpainter/CMakeLists.txt b/hist/histpainter/CMakeLists.txt index 22ed6c7619253..8dde9d7845c62 100644 --- a/hist/histpainter/CMakeLists.txt +++ b/hist/histpainter/CMakeLists.txt @@ -4,9 +4,6 @@ set(libname HistPainter) -ROOT_USE_PACKAGE(hist/hist) - - ROOT_GENERATE_DICTIONARY(G__${libname} *.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/hist/spectrum/CMakeLists.txt b/hist/spectrum/CMakeLists.txt index 8b5cc32c4ca26..14d51e3a594de 100644 --- a/hist/spectrum/CMakeLists.txt +++ b/hist/spectrum/CMakeLists.txt @@ -2,5 +2,4 @@ # CMakeLists.txt file for building ROOT hist/spectrum package ############################################################################ -ROOT_USE_PACKAGE(hist/hist) ROOT_STANDARD_LIBRARY_PACKAGE(Spectrum DEPENDENCIES Hist Matrix DICTIONARY_OPTIONS "-writeEmptyRootPCM") diff --git a/hist/spectrumpainter/CMakeLists.txt b/hist/spectrumpainter/CMakeLists.txt index 6bfd5835b3a78..8be9e941934c1 100644 --- a/hist/spectrumpainter/CMakeLists.txt +++ b/hist/spectrumpainter/CMakeLists.txt @@ -4,9 +4,6 @@ set(libname SpectrumPainter) -ROOT_USE_PACKAGE(hist/hist) - - ROOT_GENERATE_DICTIONARY(G__Spectrum2Painter *.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/html/CMakeLists.txt b/html/CMakeLists.txt index 82fdc4dce40c6..8ac208583b078 100644 --- a/html/CMakeLists.txt +++ b/html/CMakeLists.txt @@ -2,8 +2,5 @@ # CMakeLists.txt file for building ROOT html package ############################################################################ -ROOT_USE_PACKAGE(graf2d/gpad) -ROOT_USE_PACKAGE(core/thread) - ROOT_STANDARD_LIBRARY_PACKAGE(Html DEPENDENCIES Graf Thread) diff --git a/io/castor/CMakeLists.txt b/io/castor/CMakeLists.txt index f5a715fb78381..4ccb44a43c65b 100644 --- a/io/castor/CMakeLists.txt +++ b/io/castor/CMakeLists.txt @@ -2,8 +2,6 @@ # CMakeLists.txt file for building ROOT io/castor package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) include_directories(${CASTOR_INCLUDE_DIR}) if(CASTOR_VERSION VERSION_GREATER "2.0.0") diff --git a/io/dcache/CMakeLists.txt b/io/dcache/CMakeLists.txt index d3003a29a0831..a6462f3e16ad5 100644 --- a/io/dcache/CMakeLists.txt +++ b/io/dcache/CMakeLists.txt @@ -2,8 +2,6 @@ # CMakeLists.txt file for building ROOT io/dcache package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) include_directories(${DCAP_INCLUDE_DIRS}) add_definitions(-pthread) diff --git a/io/gfal/CMakeLists.txt b/io/gfal/CMakeLists.txt index d4897ed74b67f..08f82582e4b9a 100644 --- a/io/gfal/CMakeLists.txt +++ b/io/gfal/CMakeLists.txt @@ -2,8 +2,6 @@ # CMakeLists.txt file for building ROOT io/gfal package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) include_directories(${GFAL_INCLUDE_DIRS}) add_definitions(-D_FILE_OFFSET_BITS=64) diff --git a/io/io/CMakeLists.txt b/io/io/CMakeLists.txt index 85b59bd329730..8bef7e3b1a6cc 100644 --- a/io/io/CMakeLists.txt +++ b/io/io/CMakeLists.txt @@ -4,12 +4,6 @@ set(libname RIO) -ROOT_USE_PACKAGE(core) -ROOT_USE_PACKAGE(core/metautils) -ROOT_USE_PACKAGE(core/thread) -ROOT_USE_PACKAGE(math/mathcore) - - ROOT_GENERATE_DICTIONARY(G__IO *.h STAGE1 MODULE ${libname} LINKDEF LinkDef.h) ROOT_OBJECT_LIBRARY(RIOObjs G__IO.cxx *.cxx) diff --git a/io/rfio/CMakeLists.txt b/io/rfio/CMakeLists.txt index f427d05b56751..32321d2135c4e 100644 --- a/io/rfio/CMakeLists.txt +++ b/io/rfio/CMakeLists.txt @@ -2,8 +2,6 @@ # CMakeLists.txt file for building ROOT io/rfio package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) include_directories(${CASTOR_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__RFIO *.h MODULE RFIO LINKDEF LinkDef.h) diff --git a/io/sql/CMakeLists.txt b/io/sql/CMakeLists.txt index a4b9622efef1e..74ef6578d4b32 100644 --- a/io/sql/CMakeLists.txt +++ b/io/sql/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT io/sql package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) - ROOT_GENERATE_DICTIONARY(G__SQL *.h MODULE SQLIO LINKDEF LinkDef.h) ROOT_LINKER_LIBRARY(SQLIO *.cxx G__SQL.cxx DEPENDENCIES Net RIO ) diff --git a/io/xml/CMakeLists.txt b/io/xml/CMakeLists.txt index 5e677c4ab4478..cae4d4c30d632 100644 --- a/io/xml/CMakeLists.txt +++ b/io/xml/CMakeLists.txt @@ -2,8 +2,6 @@ # CMakeLists.txt file for building ROOT io/xml package ############################################################################ -ROOT_USE_PACKAGE(io/io) - ROOT_GENERATE_DICTIONARY(G__XML *.h MODULE XMLIO LINKDEF LinkDef.h) diff --git a/io/xmlparser/CMakeLists.txt b/io/xmlparser/CMakeLists.txt index fa3ce56403527..c59bfab71e28d 100644 --- a/io/xmlparser/CMakeLists.txt +++ b/io/xmlparser/CMakeLists.txt @@ -3,7 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(io/io) include_directories(${LIBXML2_INCLUDE_DIR}) add_definitions(${LIBXML2_DEFINITIONS}) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 411cf3c773821..6035c96e7548f 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -3,10 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(tree/tree) -ROOT_USE_PACKAGE(core/rint) - if(NOT WIN32) ROOT_EXECUTABLE(rootn.exe rmain.cxx LIBRARIES New Core MathCore Rint) ROOT_EXECUTABLE(roots.exe roots.cxx LIBRARIES Core MathCore) diff --git a/math/CMakeLists.txt b/math/CMakeLists.txt index e701e47d0c2e5..1e3faf0ba3607 100644 --- a/math/CMakeLists.txt +++ b/math/CMakeLists.txt @@ -1,6 +1,3 @@ -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(math/matrix) - add_subdirectory(mathcore) if(mathmore) add_subdirectory(mathmore) diff --git a/math/fftw/CMakeLists.txt b/math/fftw/CMakeLists.txt index 58f2498f9050b..f342d19cfb1c7 100644 --- a/math/fftw/CMakeLists.txt +++ b/math/fftw/CMakeLists.txt @@ -3,7 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(math/mathcore) include_directories(${FFTW_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__FFTW *.h MODULE FFTW LINKDEF LinkDef.h) diff --git a/math/foam/CMakeLists.txt b/math/foam/CMakeLists.txt index ca2d3e50c2b3b..bb0fc3be955dd 100644 --- a/math/foam/CMakeLists.txt +++ b/math/foam/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists.txt file for building ROOT math/foam package ############################################################################ -ROOT_USE_PACKAGE(hist/hist) - ROOT_STANDARD_LIBRARY_PACKAGE(Foam DEPENDENCIES Hist MathCore) diff --git a/math/fumili/CMakeLists.txt b/math/fumili/CMakeLists.txt index fd10ba7c15d87..4e224909cf7de 100644 --- a/math/fumili/CMakeLists.txt +++ b/math/fumili/CMakeLists.txt @@ -2,10 +2,6 @@ # CMakeLists.txt file for building ROOT math/fumili package ############################################################################ -ROOT_USE_PACKAGE(math/matrix) -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(hist/hist) - ROOT_STANDARD_LIBRARY_PACKAGE(Fumili DEPENDENCIES Graf Hist MathCore) diff --git a/math/genetic/CMakeLists.txt b/math/genetic/CMakeLists.txt index d1000eba4fff3..a1007e6480f41 100644 --- a/math/genetic/CMakeLists.txt +++ b/math/genetic/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(tmva) - ROOT_GENERATE_DICTIONARY(G__Genetic Math/GeneticMinimizer.h MODULE Genetic LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") ROOT_LINKER_LIBRARY(Genetic *.cxx G__Genetic.cxx LIBRARIES Core DEPENDENCIES MathCore TMVA) diff --git a/math/genvector/CMakeLists.txt b/math/genvector/CMakeLists.txt index da6bca52db1b5..c4479116fce74 100644 --- a/math/genvector/CMakeLists.txt +++ b/math/genvector/CMakeLists.txt @@ -3,7 +3,6 @@ ############################################################################ set(libname GenVector) -ROOT_USE_PACKAGE(math) set(headers Math/Vector2D.h Math/Point2D.h Math/Vector3D.h Math/Point3D.h diff --git a/math/mathcore/CMakeLists.txt b/math/mathcore/CMakeLists.txt index fcb4f96533be7..bd0dab2c7c533 100644 --- a/math/mathcore/CMakeLists.txt +++ b/math/mathcore/CMakeLists.txt @@ -2,7 +2,6 @@ # CMakeLists.txt file for building ROOT io/io package ############################################################################ -ROOT_USE_PACKAGE(core) include_directories(${CMAKE_SOURCE_DIR}/hist/hist/inc) # Explicit to avoid circular dependencies mathcore <--> hist :-( set(MATHCORE_HEADERS TRandom.h diff --git a/math/mathmore/CMakeLists.txt b/math/mathmore/CMakeLists.txt index 9e05a12cdc86a..c04d2ee1bf37b 100644 --- a/math/mathmore/CMakeLists.txt +++ b/math/mathmore/CMakeLists.txt @@ -2,8 +2,6 @@ # CMakeLists.txt file for building ROOT math/mathmore package ############################################################################ -ROOT_USE_PACKAGE(math/mathcore) - include_directories(${GSL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}) add_definitions(-DUSE_ROOT_ERROR ${GSL_CFLAGS}) diff --git a/math/matrix/CMakeLists.txt b/math/matrix/CMakeLists.txt index 0068fa1dc586e..21b7c8d783512 100644 --- a/math/matrix/CMakeLists.txt +++ b/math/matrix/CMakeLists.txt @@ -2,6 +2,4 @@ # CMakeLists.txt file for building ROOT math/matrix package ############################################################################ -ROOT_USE_PACKAGE(math/mathcore) - ROOT_STANDARD_LIBRARY_PACKAGE(Matrix DEPENDENCIES MathCore DICTIONARY_OPTIONS "-writeEmptyRootPCM") diff --git a/math/minuit/CMakeLists.txt b/math/minuit/CMakeLists.txt index d95a1a43de14d..76a3f6a22cb76 100644 --- a/math/minuit/CMakeLists.txt +++ b/math/minuit/CMakeLists.txt @@ -2,10 +2,6 @@ # CMakeLists.txt file for building ROOT math/minuit package ############################################################################ -ROOT_USE_PACKAGE(math/matrix) -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(hist/hist) - if (CMAKE_BUILD_TYPE STREQUAL Optimized) set(MINUIT_EXTRA_CONSERVATIVE_FLAGS "-fno-fast-math") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MINUIT_EXTRA_CONSERVATIVE_FLAGS}") diff --git a/math/minuit2/CMakeLists.txt b/math/minuit2/CMakeLists.txt index a87c9a798b14b..9e83d11a78df3 100644 --- a/math/minuit2/CMakeLists.txt +++ b/math/minuit2/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT math/minuit2 package ############################################################################ -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(hist/hist) - add_definitions(-DWARNINGMSG -DUSE_ROOT_ERROR) #---Deal with the parallel option on Minuit2. Probably it should be done using a build 'option' and not diff --git a/math/mlp/CMakeLists.txt b/math/mlp/CMakeLists.txt index 077e191b78dc4..e06a3a52ebab1 100644 --- a/math/mlp/CMakeLists.txt +++ b/math/mlp/CMakeLists.txt @@ -2,9 +2,5 @@ # CMakeLists.txt file for building ROOT math/physics package ############################################################################ -ROOT_USE_PACKAGE(tree/tree) -ROOT_USE_PACKAGE(tree/treeplayer) -ROOT_USE_PACKAGE(hist/hist) - ROOT_STANDARD_LIBRARY_PACKAGE(MLP DEPENDENCIES Hist Matrix Tree Graf Gpad TreePlayer MathCore) diff --git a/math/physics/CMakeLists.txt b/math/physics/CMakeLists.txt index 3e24052cc91af..6658c3ce1b369 100644 --- a/math/physics/CMakeLists.txt +++ b/math/physics/CMakeLists.txt @@ -2,11 +2,6 @@ # CMakeLists.txt file for building ROOT math/physics package ############################################################################ - -ROOT_USE_PACKAGE(hist/hist) -ROOT_USE_PACKAGE(math/matrix) -ROOT_USE_PACKAGE(math/mathcore) - ROOT_STANDARD_LIBRARY_PACKAGE(Physics DEPENDENCIES Matrix MathCore DICTIONARY_OPTIONS "-writeEmptyRootPCM") diff --git a/math/quadp/CMakeLists.txt b/math/quadp/CMakeLists.txt index 9a0cbe52b6b68..528a68224006f 100644 --- a/math/quadp/CMakeLists.txt +++ b/math/quadp/CMakeLists.txt @@ -2,6 +2,4 @@ # CMakeLists.txt file for building ROOT math/physics package ############################################################################ -ROOT_USE_PACKAGE(math/matrix) - ROOT_STANDARD_LIBRARY_PACKAGE(Quadp DEPENDENCIES Matrix) diff --git a/math/smatrix/CMakeLists.txt b/math/smatrix/CMakeLists.txt index a0d45fa0ca0fa..d0ed28fa724b4 100644 --- a/math/smatrix/CMakeLists.txt +++ b/math/smatrix/CMakeLists.txt @@ -4,8 +4,6 @@ set(libname Smatrix) -ROOT_USE_PACKAGE(math) - ROOT_GENERATE_DICTIONARY(G__${libname} Math/SMatrix.h Math/SVector.h Math/SMatrixDfwd.h Math/SMatrixFfwd.h Math/SMatrix.h Math/SVector.h diff --git a/math/splot/CMakeLists.txt b/math/splot/CMakeLists.txt index 6dbca1b8e0316..8269d04aed886 100644 --- a/math/splot/CMakeLists.txt +++ b/math/splot/CMakeLists.txt @@ -2,10 +2,5 @@ # CMakeLists.txt file for building ROOT math/splot package ############################################################################ -ROOT_USE_PACKAGE(hist/hist) -ROOT_USE_PACKAGE(tree/tree) -ROOT_USE_PACKAGE(tree/treeplayer) -ROOT_USE_PACKAGE(graf3d) - ROOT_STANDARD_LIBRARY_PACKAGE(SPlot DEPENDENCIES Matrix Hist Tree TreePlayer Graf3d Graf MathCore) diff --git a/math/unuran/CMakeLists.txt b/math/unuran/CMakeLists.txt index 3e5b9ee6bc4db..29e767caca0e9 100644 --- a/math/unuran/CMakeLists.txt +++ b/math/unuran/CMakeLists.txt @@ -51,8 +51,6 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) add_definitions(-Wno-parentheses-equality) endif() -ROOT_USE_PACKAGE(hist/hist) - include_directories(BEFORE ${UNR_UNTARDIR} ${UNR_UNTARDIR}/src ${UNR_UNTARDIR}/src/utils) add_definitions(-DHAVE_CONFIG_H) set(unrsources ${UNR_UNTARDIR}/src/utils/*.c diff --git a/misc/memstat/CMakeLists.txt b/misc/memstat/CMakeLists.txt index 9d806b78b9cde..f8bfb9a0dfea4 100644 --- a/misc/memstat/CMakeLists.txt +++ b/misc/memstat/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(hist/hist) -ROOT_USE_PACKAGE(tree/tree) - if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") endif() diff --git a/misc/table/CMakeLists.txt b/misc/table/CMakeLists.txt index b2484440d382e..eb93187a4b3fb 100644 --- a/misc/table/CMakeLists.txt +++ b/misc/table/CMakeLists.txt @@ -3,10 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(tree/tree) -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(graf3d/g3d) - ROOT_GENERATE_DICTIONARY(G__Table *.h MODULE Table LINKDEF LinkDef.h) ROOT_LINKER_LIBRARY(Table *.cxx G__Table.cxx LIBRARIES Core DEPENDENCIES Tree Gpad Graf3d Graf Hist RIO MathCore) diff --git a/montecarlo/eg/CMakeLists.txt b/montecarlo/eg/CMakeLists.txt index c6b3c3dedebf6..f5277f638dffb 100644 --- a/montecarlo/eg/CMakeLists.txt +++ b/montecarlo/eg/CMakeLists.txt @@ -5,11 +5,6 @@ set(libname EG) -ROOT_USE_PACKAGE(graf2d/gpad) -ROOT_USE_PACKAGE(graf3d/g3d) -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(math/physics) - ROOT_GENERATE_DICTIONARY(G__${libname} T*.h MODULE ${libname} LINKDEF LinkDef.h) diff --git a/montecarlo/pythia6/CMakeLists.txt b/montecarlo/pythia6/CMakeLists.txt index 91fae8f73639d..e0f3c48daf05d 100644 --- a/montecarlo/pythia6/CMakeLists.txt +++ b/montecarlo/pythia6/CMakeLists.txt @@ -3,10 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(montecarlo/eg) -ROOT_USE_PACKAGE(montecarlo/vmc) -ROOT_USE_PACKAGE(math/physics) - ROOT_GENERATE_DICTIONARY(G__Pythia6 *.h MODULE EGPythia6 LINKDEF LinkDef.h) if(pythia6_nolink) diff --git a/montecarlo/pythia8/CMakeLists.txt b/montecarlo/pythia8/CMakeLists.txt index 68c1d228c0ad7..8451214852a5b 100644 --- a/montecarlo/pythia8/CMakeLists.txt +++ b/montecarlo/pythia8/CMakeLists.txt @@ -3,8 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(montecarlo/eg) -ROOT_USE_PACKAGE(math/physics) include_directories(${PYTHIA8_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__Pythia8 *.h MODULE EGPythia8 LINKDEF LinkDef.h) diff --git a/montecarlo/vmc/CMakeLists.txt b/montecarlo/vmc/CMakeLists.txt index 0a8c129e911d9..6b30a715273c9 100644 --- a/montecarlo/vmc/CMakeLists.txt +++ b/montecarlo/vmc/CMakeLists.txt @@ -3,7 +3,4 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(montecarlo/eg) -ROOT_USE_PACKAGE(geom/geom) - ROOT_STANDARD_LIBRARY_PACKAGE(VMC DEPENDENCIES EG Geom MathCore) diff --git a/net/alien/CMakeLists.txt b/net/alien/CMakeLists.txt index 8ca860d02fd29..a9c91720af919 100644 --- a/net/alien/CMakeLists.txt +++ b/net/alien/CMakeLists.txt @@ -3,12 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(core) -ROOT_USE_PACKAGE(net/netx) -ROOT_USE_PACKAGE(proof/proofd) -ROOT_USE_PACKAGE(io/xml) - - include_directories(${ALIEN_INCLUDE_DIR}) diff --git a/net/auth/CMakeLists.txt b/net/auth/CMakeLists.txt index 0818fa4115e41..7b366a22bb40a 100644 --- a/net/auth/CMakeLists.txt +++ b/net/auth/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(net/net) -ROOT_USE_PACKAGE(io/io) - ROOT_GLOB_HEADERS(headers inc/*.h) list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/LinkDefAFS.h ${CMAKE_CURRENT_SOURCE_DIR}/inc/LinkDefRoot.h diff --git a/net/bonjour/CMakeLists.txt b/net/bonjour/CMakeLists.txt index d1c8ec6c6b15f..7ba06e30b6e22 100644 --- a/net/bonjour/CMakeLists.txt +++ b/net/bonjour/CMakeLists.txt @@ -3,8 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(net/net) -ROOT_USE_PACKAGE(io/io) include_directories(${BONJOUR_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__BONJ *.h MODULE Bonjour LINKDEF LinkDef.h) diff --git a/net/davix/CMakeLists.txt b/net/davix/CMakeLists.txt index 7546ae1c7063e..93d1dd07f9fac 100644 --- a/net/davix/CMakeLists.txt +++ b/net/davix/CMakeLists.txt @@ -3,10 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(core) -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) - include_directories(${DAVIX_INCLUDE_DIRS}) # Workaround for defects in davix 0.3.1: https://its.cern.ch/jira/browse/DMC-577 diff --git a/net/globusauth/CMakeLists.txt b/net/globusauth/CMakeLists.txt index 0c1ded2d1021a..8584d4673f98a 100644 --- a/net/globusauth/CMakeLists.txt +++ b/net/globusauth/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT net/globusauth package ############################################################################ -ROOT_USE_PACKAGE(net/net) -ROOT_USE_PACKAGE(net/auth) - include_directories(${GLOBUS_INCLUDE_DIRS}) if(ssl) include_directories(${OPENSSL_INCLUDE_DIR}) diff --git a/net/http/CMakeLists.txt b/net/http/CMakeLists.txt index 49939ef183135..443ab64b110d2 100644 --- a/net/http/CMakeLists.txt +++ b/net/http/CMakeLists.txt @@ -3,10 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(core) -ROOT_USE_PACKAGE(tree/tree) -ROOT_USE_PACKAGE(io/xml) - ROOT_GLOB_HEADERS(headers inc/*.h) ROOT_GLOB_SOURCES(sources src/*.cxx civetweb/civetweb.c) diff --git a/net/krb5auth/CMakeLists.txt b/net/krb5auth/CMakeLists.txt index 652871d9434db..84e797f4d129c 100644 --- a/net/krb5auth/CMakeLists.txt +++ b/net/krb5auth/CMakeLists.txt @@ -3,10 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(core) -ROOT_USE_PACKAGE(net/net) -ROOT_USE_PACKAGE(net/auth) - include_directories(${KRB5_INCLUDE_DIRS}) set_directory_properties(PROPERTIES COMPILE_DEFINITIONS R__KRB5INIT="${KRB5_INIT}") diff --git a/net/ldap/CMakeLists.txt b/net/ldap/CMakeLists.txt index 759d35bc26176..f11d2ebce4775 100644 --- a/net/ldap/CMakeLists.txt +++ b/net/ldap/CMakeLists.txt @@ -2,7 +2,6 @@ # CMakeLists.txt file for building ROOT net/ldap package ############################################################################ -ROOT_USE_PACKAGE(net/net) include_directories(${LDAP_INCLUDE_DIRS}) add_definitions(-DLDAP_DEPRECATED) diff --git a/net/monalisa/CMakeLists.txt b/net/monalisa/CMakeLists.txt index ba0516526b4d1..7155971c0e87f 100644 --- a/net/monalisa/CMakeLists.txt +++ b/net/monalisa/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(core) -ROOT_USE_PACKAGE(net/net) - include_directories(${MONALISA_INCLUDE_DIR}) #set_directory_properties(PROPERTIES COMPILE_DEFINITIONS R__KRB5INIT="${KRB5_INIT}") diff --git a/net/net/CMakeLists.txt b/net/net/CMakeLists.txt index 60123e71219bf..8704fe6928b5b 100644 --- a/net/net/CMakeLists.txt +++ b/net/net/CMakeLists.txt @@ -2,10 +2,6 @@ # CMakeLists.txt file for building ROOT net/net package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(math/mathcore) - - ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc inc/*.h) ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src src/*.cxx) diff --git a/net/netx/CMakeLists.txt b/net/netx/CMakeLists.txt index 352888b3cd7fd..99b6946a5bc3d 100644 --- a/net/netx/CMakeLists.txt +++ b/net/netx/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(net/net) -ROOT_USE_PACKAGE(proof/proofd) - include_directories(${XROOTD_INCLUDE_DIRS}) add_definitions(${XROOTD_CFLAGS}) #--------------------------------------------------------------------------- diff --git a/net/netxng/CMakeLists.txt b/net/netxng/CMakeLists.txt index 9eab1cf478d21..c73153c9318ea 100644 --- a/net/netxng/CMakeLists.txt +++ b/net/netxng/CMakeLists.txt @@ -3,8 +3,6 @@ # @author Lukasz Janyst ############################################################################ -ROOT_USE_PACKAGE(net/net) - include_directories(${XROOTD_INCLUDE_DIRS}) add_definitions(${XROOTD_CFLAGS}) diff --git a/net/rpdutils/CMakeLists.txt b/net/rpdutils/CMakeLists.txt index 36df2c97563fd..5cad4615ca028 100644 --- a/net/rpdutils/CMakeLists.txt +++ b/net/rpdutils/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(net/net) -ROOT_USE_PACKAGE(net/auth) - ROOT_GLOB_SOURCES(rpdutilsrcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx) list(REMOVE_ITEM rpdutilsrcs src/rpdpriv.cxx src/rpdconn.cxx) diff --git a/proof/proof/CMakeLists.txt b/proof/proof/CMakeLists.txt index 1bd5158d2bb90..8f85394992692 100644 --- a/proof/proof/CMakeLists.txt +++ b/proof/proof/CMakeLists.txt @@ -3,10 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(net/net) -ROOT_USE_PACKAGE(tree/tree) -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(core/thread) include_directories(${CMAKE_SOURCE_DIR}/proof/proofplayer/inc) # To avoid circular dependencies :-( ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc inc/*.h) diff --git a/proof/proofbench/CMakeLists.txt b/proof/proofbench/CMakeLists.txt index 863b1526551e3..aa2d4b24fc016 100644 --- a/proof/proofbench/CMakeLists.txt +++ b/proof/proofbench/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT proof/proofbench package ############################################################################ -ROOT_USE_PACKAGE(proof/proof) -ROOT_USE_PACKAGE(proof/proofplayer) - ROOT_GLOB_HEADERS(headers inc/TProof*.h) ROOT_GLOB_SOURCES(sources src/TProof*.cxx) diff --git a/proof/proofd/CMakeLists.txt b/proof/proofd/CMakeLists.txt index 4c15b7502fbdc..a3964d410146c 100644 --- a/proof/proofd/CMakeLists.txt +++ b/proof/proofd/CMakeLists.txt @@ -3,10 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(proof/proof) -ROOT_USE_PACKAGE(net/rpdutils) -ROOT_USE_PACKAGE(net/auth) - include_directories(${XROOTD_INCLUDE_DIRS}) add_definitions(${XROOTD_CFLAGS}) ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-undefined-bool-conversion) diff --git a/proof/proofplayer/CMakeLists.txt b/proof/proofplayer/CMakeLists.txt index d01d27cc087df..0dd889e613efb 100644 --- a/proof/proofplayer/CMakeLists.txt +++ b/proof/proofplayer/CMakeLists.txt @@ -3,9 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(proof/proof) -ROOT_USE_PACKAGE(tree/treeplayer) - ROOT_GLOB_HEADERS(headers inc/*.h) list(REMOVE_ITEM headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/TProofDraw.h ${CMAKE_CURRENT_SOURCE_DIR}/inc/LinkDef.h diff --git a/proof/proofx/CMakeLists.txt b/proof/proofx/CMakeLists.txt index 8e5fdf4473244..1bef1c3d6a136 100644 --- a/proof/proofx/CMakeLists.txt +++ b/proof/proofx/CMakeLists.txt @@ -4,9 +4,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(proof/proofd) -ROOT_USE_PACKAGE(proof/proofplayer) - if(WIN32) set(headers TXProofMgr.h TXSlave.h TXSocket.h TXSocketHandler.h TXHandler.h) set(sources TXProofMgr.cxx TXSlave.cxx TXSocket.cxx TXSocketHandler.cxx TXHandler.cxx diff --git a/roofit/CMakeLists.txt b/roofit/CMakeLists.txt index 4de943753c94c..b29afeacbcb77 100644 --- a/roofit/CMakeLists.txt +++ b/roofit/CMakeLists.txt @@ -5,15 +5,8 @@ if(NOT CMAKE_PROJECT_NAME STREQUAL ROOT) include(${ROOT_USE_FILE}) endif() -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(math/foam) -ROOT_USE_PACKAGE(math/minuit) -ROOT_USE_PACKAGE(math/smatrix) -ROOT_USE_PACKAGE(proof/proof) - if(mathmore OR ROOT_mathmore_FOUND) set(ROOT_MATHMORE_LIBRARY MathMore) - ROOT_USE_PACKAGE(math/mathmore) endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}/roofit/inc) diff --git a/roofit/histfactory/CMakeLists.txt b/roofit/histfactory/CMakeLists.txt index 76f729fba0ab3..11c9b9114f677 100644 --- a/roofit/histfactory/CMakeLists.txt +++ b/roofit/histfactory/CMakeLists.txt @@ -3,8 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(io/xmlparser) - ROOT_GENERATE_DICTIONARY(G__HistFactory RooStats/HistFactory/*.h MODULE HistFactory LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/rootx/CMakeLists.txt b/rootx/CMakeLists.txt index 73e2baf71bbd2..19c49993096ba 100644 --- a/rootx/CMakeLists.txt +++ b/rootx/CMakeLists.txt @@ -3,7 +3,6 @@ # @author Pere Mato, CERN ############################################################################ -ROOT_USE_PACKAGE(core) if(x11) include_directories(${X11_INCLUDE_DIR}) ROOT_EXECUTABLE(root *.cxx ${CMAKE_SOURCE_DIR}/core/clib/src/strlcpy.c diff --git a/sql/mysql/CMakeLists.txt b/sql/mysql/CMakeLists.txt index 601d81c34b2eb..74af28e2af8e5 100644 --- a/sql/mysql/CMakeLists.txt +++ b/sql/mysql/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT sql/mysql package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) - include_directories(${MYSQL_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__MySQL *.h MODULE RMySQL LINKDEF LinkDef.h) diff --git a/sql/odbc/CMakeLists.txt b/sql/odbc/CMakeLists.txt index b27076cb05189..eb03bf66250bc 100644 --- a/sql/odbc/CMakeLists.txt +++ b/sql/odbc/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT sql/odbc package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) - include_directories(${ODBC_INCLUDE_DIR}) if(MACOSX_ODBC_DEPRECATED) add_definitions(-Wno-deprecated-declarations) diff --git a/sql/oracle/CMakeLists.txt b/sql/oracle/CMakeLists.txt index 2769b96f427ee..5d0ef7076cca6 100644 --- a/sql/oracle/CMakeLists.txt +++ b/sql/oracle/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT sql/oracle package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) - include_directories(${ORACLE_INCLUDE_DIR}) add_definitions(${ORACLE_DEFINITIONS}) diff --git a/sql/pgsql/CMakeLists.txt b/sql/pgsql/CMakeLists.txt index a7ecd30ba7fef..1c8c98ae79923 100644 --- a/sql/pgsql/CMakeLists.txt +++ b/sql/pgsql/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT sql/pgsql package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) - include_directories(${POSTGRESQL_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__PgSQL *.h MODULE RPgSQL LINKDEF LinkDef.h) diff --git a/sql/sqlite/CMakeLists.txt b/sql/sqlite/CMakeLists.txt index d27c0a9d26ae8..1488e5647a581 100644 --- a/sql/sqlite/CMakeLists.txt +++ b/sql/sqlite/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists.txt file for building ROOT sql/pgsql package ############################################################################ -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) - include_directories(${SQLITE_INCLUDE_DIR}) ROOT_GENERATE_DICTIONARY(G__SQLite *.h MODULE RSQLite LINKDEF LinkDef.h) diff --git a/tmva/tmva/CMakeLists.txt b/tmva/tmva/CMakeLists.txt index 5d3680a9bcfc9..de46153a74691 100644 --- a/tmva/tmva/CMakeLists.txt +++ b/tmva/tmva/CMakeLists.txt @@ -11,14 +11,6 @@ if(NOT CMAKE_PROJECT_NAME STREQUAL ROOT) include(${ROOTSYS}/cmake/modules/StandaloneBuild.cmake) endif() -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(math/minuit) -ROOT_USE_PACKAGE(math/mlp) -ROOT_USE_PACKAGE(hist/histpainter) -ROOT_USE_PACKAGE(tree/treeplayer) -ROOT_USE_PACKAGE(io/xml) -#ROOT_USE_PACKAGE(gui/gui) - set(headers1 Configurable.h Event.h Factory.h MethodBase.h MethodCompositeBase.h MethodANNBase.h MethodTMlpANN.h MethodRuleFit.h MethodCuts.h MethodFisher.h MethodKNN.h MethodCFMlpANN.h MethodCFMlpANN_Utils.h MethodLikelihood.h diff --git a/tmva/tmvagui/CMakeLists.txt b/tmva/tmvagui/CMakeLists.txt index 534d67eb75bc2..1feb86df6486f 100644 --- a/tmva/tmvagui/CMakeLists.txt +++ b/tmva/tmvagui/CMakeLists.txt @@ -11,9 +11,6 @@ if(NOT CMAKE_PROJECT_NAME STREQUAL ROOT) include(${ROOTSYS}/cmake/modules/StandaloneBuild.cmake) endif() -ROOT_USE_PACKAGE(tmva/tmva) -ROOT_USE_PACKAGE(gui/gui) - set(headers1 annconvergencetest.h deviations.h mvaeffs.h PlotFoams.h TMVAGui.h BDTControlPlots.h correlationscatters.h efficiencies.h mvas.h probas.h BDT.h correlationscattersMultiClass.h likelihoodrefs.h mvasMulticlass.h regression_averagedevs.h TMVAMultiClassGui.h diff --git a/tree/tree/CMakeLists.txt b/tree/tree/CMakeLists.txt index 03188f9b19f76..e6b34a497e47d 100644 --- a/tree/tree/CMakeLists.txt +++ b/tree/tree/CMakeLists.txt @@ -5,13 +5,6 @@ set(libname Tree) -ROOT_USE_PACKAGE(io/io) -ROOT_USE_PACKAGE(net/net) -ROOT_USE_PACKAGE(math/mathcore) -ROOT_USE_PACKAGE(core/metautils) -ROOT_USE_PACKAGE(core/thread) -ROOT_USE_PACKAGE(hist/hist) - ROOT_GENERATE_DICTIONARY(G__${libname} *.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") #ROOT_GENERATE_DICTIONARY(ManualTree TTree.h LINKDEF LinkDef2.h) diff --git a/tree/treeplayer/CMakeLists.txt b/tree/treeplayer/CMakeLists.txt index ed7cba5a0094e..4be4eef7dd5cf 100644 --- a/tree/treeplayer/CMakeLists.txt +++ b/tree/treeplayer/CMakeLists.txt @@ -5,11 +5,6 @@ set(libname TreePlayer) -ROOT_USE_PACKAGE(tree/tree) -ROOT_USE_PACKAGE(gui/gui) -ROOT_USE_PACKAGE(graf3d/g3d) - - ROOT_GENERATE_DICTIONARY(G__${libname} *.h MODULE ${libname} LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM") diff --git a/tree/treeviewer/CMakeLists.txt b/tree/treeviewer/CMakeLists.txt index 5102486ceec5b..92a93c385dcf3 100644 --- a/tree/treeviewer/CMakeLists.txt +++ b/tree/treeviewer/CMakeLists.txt @@ -5,9 +5,6 @@ set(libname TreeViewer) -ROOT_USE_PACKAGE(tree/treeplayer) -ROOT_USE_PACKAGE(gui/ged) - if(${ROOT_ARCHITECTURE} MATCHES win32old) set(headers TTreeViewerOld.h TPaveVar.h) set(sources TTreeViewerOld.cxx TPaveVar.cxx)