bos #42837: shape recognition - ensure compilation on different os

diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf
index 853da054a8d12a33263ce43709b456e0bf576df9..4ca5b04e670a93819f1e4243c008213e60e83ffc 100644 (file)
--- a/products/MEDCOUPLING.pyconf
+++ b/products/MEDCOUPLING.pyconf
@@ -64,8 +64,9 @@ default_win :
               "six",
               "pytz",
               "numpy",
-              "CONFIGURATION"
-             ]
+              "CONFIGURATION",
+              "openblas"
+            ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 }
 

diff --git a/products/compil_scripts/openblas-0.3.23.bat b/products/compil_scripts/openblas-0.3.23.bat
index dbe6fb65b03ddb5ca0341be3b22559ada9d43107..01a05992c1874a89e675f3cc7b463d2a5216c464 100644 (file)
--- a/products/compil_scripts/openblas-0.3.23.bat
+++ b/products/compil_scripts/openblas-0.3.23.bat
@@ -28,6 +28,7 @@ mkdir %BUILD_DIR%
 
 SET CMAKE_OPTIONS=
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 

diff --git a/products/env_scripts/lapack.py b/products/env_scripts/lapack.py
index 355306c96449e313d03496783e0dcc2604cfe95d..c15608ee926e3fc82f49f2ecf11a52c2eb95e55a 100644 (file)
--- a/products/env_scripts/lapack.py
+++ b/products/env_scripts/lapack.py
@@ -23,7 +23,13 @@ def set_env(env, prereq_dir, version):
     env.set('CBLAS_ROOT_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'cblas-3.8.0'))
   else:
     env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
-
+    env.set('BLAS', os.path.join(prereq_dir, 'lib'))
+    env.set('LAPACK', os.path.join(prereq_dir, 'lib'))
+    env.set('ATLAS', os.path.join(prereq_dir, 'lib'))
+    env.set('LAPACKE_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapacke-3.8.0'))
+    env.set('LAPACKE_INCDIR', os.path.join(prereq_dir,'include'))
+    env.set('LAPACKE_LIBDIR', os.path.join(prereq_dir,'lib'))
+    env.set('CBLAS_ROOT_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'cblas-3.8.0'))
 def set_nativ_env(env):
     env.set('LAPACKHOME', '/usr')
     env.set('LAPACK_ROOT_DIR', '/')