From 6822fdb995136cebbfd53acbf4c5b1e85d04375f Mon Sep 17 00:00:00 2001 From: tmadlener Date: Fri, 8 Mar 2024 15:29:57 +0100 Subject: [PATCH] Disable deprecated ROOT build option --- ilcsoft/root.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ilcsoft/root.py b/ilcsoft/root.py index 17296df4..4d11462e 100644 --- a/ilcsoft/root.py +++ b/ilcsoft/root.py @@ -110,7 +110,10 @@ def compile(self): self.envcmake['GSL_ROOT_DIR']=gsl.installPath self.envcmake['GSL_CONFIG_EXECUTABLE']=gsl_bindir+'/gsl-config' - self.envcmake.setdefault( 'gsl_shared', 'ON' ) + if Version(self.version) < "6.30": + self.envcmake.setdefault( 'gsl_shared', 'ON' ) + self.envcmake.setdefault( 'builtin_gsl', 'OFF' ) # we provide GSL, don't recompile it ! + self.envcmake.setdefault( 'gdml', 'ON' ) self.envcmake.setdefault( 'minuit2', 'ON' ) self.envcmake.setdefault( 'roofit', 'ON' ) @@ -118,7 +121,6 @@ def compile(self): self.envcmake.setdefault( 'xrootd', 'ON' ) self.envcmake.setdefault( 'mathmore', 'ON' ) self.envcmake.setdefault( 'builtin_xrootd', 'ON' ) - self.envcmake.setdefault( 'builtin_gsl', 'OFF' ) # we provide GSL, don't recompile it ! self.envcmake.setdefault( 'fortran', 'OFF' ) self.envcmake.setdefault( 'mysql', 'OFF' ) self.envcmake.setdefault( 'sqlite', 'OFF' )