remove ROOT_USE_PACKAGE macro; see ROOT-7582

saberduck · Aug 23, 2015 · 27d4fac · 27d4fac
1 parent f5203e5
commit 27d4fac
Show file tree

Hide file tree

Showing 107 changed files with 0 additions and 340 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 )