Changeset 0056a05e in sasview

Timestamp:

Oct 18, 2017 9:19:00 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d0c7d06

Parents:

202a4ce9

Message:

Modified mkl check paths

File:

• installers/setup_exe.py (modified) (1 diff)

installers/setup_exe.py

@@ -267 +267 @@
 
 if mkl_dlls:
+    data_files.append(('.', mkl_dlls))
+elif atlas_dlls:
     data_files.append(('.', atlas_dlls))
-elif atlas_dlls:
-    data_files.append(('.', mkl_dlls))
 
 if is_64bits: