Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
pythia8=OFF
mysql=OFF
ccache=On
3 changes: 0 additions & 3 deletions .github/workflows/root-ci-config/buildconfig/global.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ mathmore=ON
memory_termination=OFF
minimal=OFF
mpi=OFF
mysql=ON
odbc=OFF
opengl=ON
pgsql=ON
pyroot=ON
pythia8=ON
qt5web=OFF
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/root-ci-config/buildconfig/mac-beta.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ builtin_zstd=ON
ccache=ON
cocoa=ON
fortran=OFF
mysql=OFF
pgsql=OFF
pythia8=OFF
test_distrdf_dask=ON
test_distrdf_pyspark=ON
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/root-ci-config/buildconfig/mac13.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ builtin_zstd=ON
ccache=ON
cocoa=ON
fortran=OFF
mysql=OFF
pgsql=OFF
pythia8=OFF
test_distrdf_dask=ON
test_distrdf_pyspark=ON
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/root-ci-config/buildconfig/mac14.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ builtin_zstd=ON
ccache=ON
cocoa=ON
fortran=OFF
mysql=OFF
pgsql=OFF
pythia8=OFF
test_distrdf_dask=ON
test_distrdf_pyspark=ON
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/root-ci-config/buildconfig/mac15.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ builtin_zstd=ON
ccache=ON
cocoa=ON
fortran=OFF
mysql=OFF
pgsql=OFF
pythia8=OFF
test_distrdf_dask=ON
test_distrdf_pyspark=ON
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ tmva-cudnn=ON
tmva-pymva=ON
fortran=OFF
gdml=OFF
mysql=OFF
spectrum=OFF
sqlite=OFF
test_distrdf_dask=OFF
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/root-ci-config/buildconfig/windows10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ davix=OFF
llvm13_broken_tests=OFF
minuit2_mpi=OFF
minuit2_omp=OFF
mysql=OFF
odbc=ON
pgsql=OFF
pyroot2=OFF
pyroot3=ON
pythia8=OFF
Expand Down
1 change: 1 addition & 0 deletions README/ReleaseNotes/v636/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ The following people have contributed to this new version:
* The `RooDataSet` constructors to construct a dataset from a part of an existing dataset are deprecated and will be removed in ROOT 6.38. This is to avoid interface duplication. Please use `RooAbsData::reduce()` instead, or if you need to change the weight column, use the universal constructor with the `Import()`, `Cut()`, and `WeightVar()` arguments.
* The ROOT splash screen was removed for Linux and macOS
* Proof support has been completely removed form RooFit and RooStats, after it was already not working anymore for several releases
* The build options `mysql`, `odbc`, and `pgsql` have been deprecated. Please complain with root-dev@cern.ch should you still need one!

## Python Interface

Expand Down
11 changes: 4 additions & 7 deletions cmake/modules/RootBuildOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ ROOT_BUILD_OPTION(memory_termination OFF "Free internal ROOT memory before proce
ROOT_BUILD_OPTION(minuit2_mpi OFF "Enable support for MPI in Minuit2")
ROOT_BUILD_OPTION(minuit2_omp OFF "Enable support for OpenMP in Minuit2")
ROOT_BUILD_OPTION(mpi OFF "Enable support for Message Passing Interface (MPI)")
ROOT_BUILD_OPTION(mysql ON "Enable support for MySQL databases")
ROOT_BUILD_OPTION(odbc OFF "Enable support for ODBC databases (requires libiodbc or libodbc)")
ROOT_BUILD_OPTION(mysql OFF "Enable support for MySQL databases (deprecated)")
ROOT_BUILD_OPTION(odbc OFF "Enable support for ODBC databases (requires libiodbc or libodbc; deprecated)")
ROOT_BUILD_OPTION(opengl ON "Enable support for OpenGL (requires libGL and libGLU)")
ROOT_BUILD_OPTION(pgsql ON "Enable support for PostgreSQL")
ROOT_BUILD_OPTION(pgsql OFF "Enable support for PostgreSQL (deprecated)")
ROOT_BUILD_OPTION(proof OFF "Enable support for PROOF")
ROOT_BUILD_OPTION(pyroot ON "Enable support for automatic Python bindings (PyROOT)")
ROOT_BUILD_OPTION(pythia8 OFF "Enable support for Pythia 8.x [GPL]")
Expand Down Expand Up @@ -232,10 +232,7 @@ if(all)
set(fcgi_defvalue ON)
set(imt_defvalue ON)
set(mathmore_defvalue ON)
set(mysql_defvalue ON)
set(odbc_defvalue ON)
set(opengl_defvalue ON)
set(pgsql_defvalue ON)
set(proof_defvalue OFF)
set(pythia8_defvalue ON)
set(pyroot_defvalue ON)
Expand Down Expand Up @@ -401,7 +398,7 @@ foreach(opt afdsmgrd afs alien bonjour builtin_afterimage castor chirp cxx11 cxx
endforeach()

#---Deprecated options------------------------------------------------------------------------
foreach(opt html)
foreach(opt html mysql odbc pgsql)
if(${opt})
message(DEPRECATION ">>> Option '${opt}' is deprecated and will be removed in the next release of ROOT. Please contact root-dev@cern.ch should you still need it.")
endif()
Expand Down
Loading