diff --git a/ilcsoft/root.py b/ilcsoft/root.py index 17296df4..dcddf536 100644 --- a/ilcsoft/root.py +++ b/ilcsoft/root.py @@ -107,10 +107,11 @@ def compile(self): self.envcmake['CMAKE_INSTALL_PREFIX']=self.installPath - self.envcmake['GSL_ROOT_DIR']=gsl.installPath - self.envcmake['GSL_CONFIG_EXECUTABLE']=gsl_bindir+'/gsl-config' + if Version(self.version) <= "6.30.04": + self.envcmake['GSL_ROOT_DIR']=gsl.installPath + self.envcmake['GSL_CONFIG_EXECUTABLE']=gsl_bindir+'/gsl-config' + self.envcmake.setdefault( 'gsl_shared', 'ON' ) - self.envcmake.setdefault( 'gsl_shared', 'ON' ) self.envcmake.setdefault( 'gdml', 'ON' ) self.envcmake.setdefault( 'minuit2', 'ON' ) self.envcmake.setdefault( 'roofit', 'ON' )