diff --git a/ilcsoft/root.py b/ilcsoft/root.py index 4d11462e..a775c914 100644 --- a/ilcsoft/root.py +++ b/ilcsoft/root.py @@ -115,7 +115,7 @@ def compile(self): 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( 'minuit2', 'ON' ) self.envcmake.setdefault( 'roofit', 'ON' ) self.envcmake.setdefault( 'unuran', 'ON' ) self.envcmake.setdefault( 'xrootd', 'ON' ) @@ -138,9 +138,12 @@ def compile(self): # Need to symlink two cmake scripts that are not installed properly # otherwise and would break packages that depend on ROOT for mod in ['RootMacros.cmake', 'RootTestDriver.cmake']: - link_path = os.path.join(self.installPath, 'cmake', mod) - src = os.path.join(self.installPath, 'cmake', 'modules', mod) - os.symlink(src, link_path) + try: + link_path = os.path.join(self.installPath, 'cmake', mod) + src = os.path.join(self.installPath, 'cmake', 'modules', mod) + os.symlink(src, link_path) + except FileExistsError: + pass def postCheckDeps(self): BaseILC.postCheckDeps(self)