Changeset 90b9b320 in sasview


Ignore:
Timestamp:
Dec 11, 2017 5:17:53 AM (6 weeks ago)
Author:
trnielsen
Branches:
SasView-664
Parents:
bb6db2a0
Message:

Include MKL on Win or OSX

Changes to be committed:

modified: sasview.spec

File:
1 edited

Legend:

Unmodified
Added
Removed
  • installers/sasview.spec

    r4a748525 r90b9b320  
    7777if os.path.exists(os.path.join(LIBLOC, LIBPREFIX + 'mkl_core.' + LIBSUFFIX)): 
    7878    datas.append(add_binary(LIBPREFIX + 'mkl_avx2.' + LIBSUFFIX)) 
    79     datas.append(add_binary(LIBPREFIX + 'mkl_def.' + LIBSUFFIX)) 
     79    if os.name == 'nt': 
     80        datas.append(add_binary(LIBPREFIX + 'mkl_def.' + LIBSUFFIX)) 
     81    if sys.platform == 'darwin': 
     82        datas.append(add_binary(LIBPREFIX + 'mkl_core.' + LIBSUFFIX)) 
    8083elif os.path.exists(os.path.join(LIBLOC, LIBPREFIX + 'numpy-atlas.' + LIBSUFFIX)): 
    8184    datas.append(add_binary(LIBPREFIX + 'numpy-atlas.' + LIBSUFFIX)) 
Note: See TracChangeset for help on using the changeset viewer.