From 352bc28868ea943fe0270e88ef37ba7176293b79 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 20 Sep 2024 10:11:28 +0200 Subject: [PATCH] bos #42837: shape recognition - ensure compilation on different os --- products/MEDCOUPLING.pyconf | 5 +++-- products/compil_scripts/openblas-0.3.23.bat | 1 + products/env_scripts/lapack.py | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index 853da05..4ca5b04 100644 --- 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 dbe6fb6..01a0599 100644 --- 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 355306c..c15608e 100644 --- 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', '/') -- 2.39.2