Merge pull request #20232 from appolloford/20240327172623_new_pr_CVXO…

…PT131 Fix suitesparse path
easybuilders · May 30, 2024 · 9c8aa3e · 9c8aa3e
2 parents da3faa9 + 2e83008
commit 9c8aa3e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb b/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb
@@ -32,8 +32,15 @@ use_pip = True
 sanity_pip_check = True
 download_dep_fail = True
 
-preinstallopts = 'CVXOPT_BUILD_FFTW=1 CVXOPT_BUILD_GSL=1 CVXOPT_BLAS_EXTRA_LINK_ARGS="$LIBLAPACK" '
-preinstallopts += 'CVXOPT_FFTW_EXTRA_LINK_ARGS="$LIBFFT" CVXOPT_SUITESPARSE_SRC_DIR=$EBROOTSUITESPARSE'
+preinstallopts = " ".join([
+    'CVXOPT_BUILD_FFTW=1',
+    'CVXOPT_BUILD_GSL=1',
+    'CVXOPT_BLAS_EXTRA_LINK_ARGS="$LIBBLAS"',
+    'CVXOPT_LAPACK_EXTRA_LINK_ARGS="$LIBLAPACK"',
+    'CVXOPT_FFTW_EXTRA_LINK_ARGS="$LIBFFT"',
+    'CVXOPT_SUITESPARSE_LIB_DIR=$EBROOTSUITESPARSE/lib',
+    'CVXOPT_SUITESPARSE_INC_DIR=$EBROOTSUITESPARSE/include',
+])
 
 installopts = ' --no-binary cvxopt'