mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed intel compiler detection for more recent versions (XE 2013 SP1)

metadata
Wenzel Jakob 2013-11-07 07:50:53 -08:00
parent dccb7554ea
commit 492d99427a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/scons/icl12.py
View File

@ -111,16 +111,21 @@ def generate(env):
else: else:
raise Exception('Unknown version of visual studio!') raise Exception('Unknown version of visual studio!')
if 'ICPP_COMPOSER2011' in os.environ: if 'ICPP_COMPOSER2014' in os.environ:
icpp_path = os.environ.get('ICPP_COMPOSER2011') icpp_path = os.environ.get('ICPP_COMPOSER2014')
elif 'ICPP_COMPILER12' in os.environ: elif 'ICPP_COMPILER14' in os.environ:
icpp_path = os.environ.get('ICPP_COMPILER12') icpp_path = os.environ.get('ICPP_COMPILER14')
elif 'ICPP_COMPOSER2013' in os.environ: elif 'ICPP_COMPOSER2013' in os.environ:
icpp_path = os.environ.get('ICPP_COMPOSER2013') icpp_path = os.environ.get('ICPP_COMPOSER2013')
elif 'ICPP_COMPILER13' in os.environ: elif 'ICPP_COMPILER13' in os.environ:
icpp_path = os.environ.get('ICPP_COMPILER13') icpp_path = os.environ.get('ICPP_COMPILER13')
elif 'ICPP_COMPOSER2011' in os.environ:
icpp_path = os.environ.get('ICPP_COMPOSER2011')
elif 'ICPP_COMPILER12' in os.environ:
icpp_path = os.environ.get('ICPP_COMPILER12')
else: else:
raise Exception('Could not find any of the ICCPP_* environment variables!') raise Exception('Could not find any of the ICCPP_* environment variables!')
merge_script_vars(env, os.path.join(icpp_path, 'bin/iclvars.bat'), arch + ' ' + vsrelease) merge_script_vars(env, os.path.join(icpp_path, 'bin/iclvars.bat'), arch + ' ' + vsrelease)
env['REDIST_PATH'] = os.path.join(os.path.join(os.path.join(icpp_path, 'redist'), arch_redist), 'compiler') env['REDIST_PATH'] = os.path.join(os.path.join(os.path.join(icpp_path, 'redist'), arch_redist), 'compiler')