tmp

wortiz · Aug 21, 2024 · f8972d2 · f8972d2
1 parent b7360c9
commit f8972d2
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 48 deletions.
diff --git a/tpls/tpl_tools/packages/arpack-ng.py b/tpls/tpl_tools/packages/arpack-ng.py
@@ -22,10 +22,10 @@ def set_environment(self, builder):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
-        builder.add_option("-D=MPI=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
+        builder.add_option("-DMPI=ON")
 
     def register(self, builder):
         registry = builder._registry

diff --git a/tpls/tpl_tools/packages/catch2.py b/tpls/tpl_tools/packages/catch2.py
@@ -18,9 +18,9 @@ def __init__(self):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
 
     def register(self, builder):
         registry = builder._registry

diff --git a/tpls/tpl_tools/packages/fmt.py b/tpls/tpl_tools/packages/fmt.py
@@ -26,9 +26,9 @@ def setDependencies(self, builder):
     def configure_options(self, builder):
         CXX = builder.env["CXX"]
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
         builder.add_option("-DCMAKE_CXX_COMPILER=" + CXX)
 
     def register(self, builder):

diff --git a/tpls/tpl_tools/packages/lapack.py b/tpls/tpl_tools/packages/lapack.py
@@ -18,9 +18,9 @@ def __init__(self):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
 
 
     def register(self, builder):
@@ -38,6 +38,4 @@ def register(self, builder):
             "LAPACK_LIBRARIES",
             os.path.join(builder.install_dir(), "lib/liblapack" + ext),
         )
-        registry.append_environment_variable("LAPACK_LIBRARIES",
-            os.path.join(builder.install_dir(), "lib/libblas" + ext))
         registry.append_environment_variable("CMAKE_PREFIX_PATH", builder.install_dir())
diff --git a/tpls/tpl_tools/packages/metis.py b/tpls/tpl_tools/packages/metis.py
@@ -15,12 +15,12 @@ def __init__(self):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
-            builder.add_option("-D=SHARED:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DSHARED:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
-            builder.add_option("-D=SHARED:BOOL=OFF")
-        builder.add_option("-D=GKLIB_PATH=./GKlib")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
+            builder.add_option("-DSHARED:BOOL=OFF")
+        builder.add_option("-DGKLIB_PATH=./GKlib")
 
     def register(self, builder):
         registry = builder._registry

diff --git a/tpls/tpl_tools/packages/mumps.py b/tpls/tpl_tools/packages/mumps.py
@@ -78,12 +78,13 @@ def configure_options(self, builder):
             f.write("FL      = " + builder.env["FC"] + "\n")
             f.write("AR      = ar vr \n")
             f.write("RANLIB  = ranlib \n")
-            f.write("LAPACK = " + builder.env["LAPACK_LIBRARIES"].replace(":"," ") + "\n")
+            f.write("LAPACK = " + builder.env["LAPACK_LIBRARIES"] + " " builder.env["BLAS_LIBRARIES"] + "\n")
             f.write(
                 "SCALAP  = -L"
                 + builder.env["SCALAPACK_DIR"]
                 + "/lib -lscalapack "
-                + builder.env["LAPACK_LIBRARIES"].replace(":", " ")
+                + builder.env["LAPACK_LIBRARIES"]
+                + " " + builder.env["BLAS_LIBRARIES"]
                 + "\n"
             )
             f.write("BLAS = " + builder.env["BLAS_LIBRARIES"] + "\n")

diff --git a/tpls/tpl_tools/packages/netcdf.py b/tpls/tpl_tools/packages/netcdf.py
@@ -33,9 +33,9 @@ def set_environment(self, builder):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
         builder.add_option("-DENABLE_DAP=OFF")
         builder.add_option("-DENABLE_BYTERANGE:BOOL=OFF")
         builder.add_option("-DENABLE_PNETCDF:BOOL=ON")

diff --git a/tpls/tpl_tools/packages/omega_h.py b/tpls/tpl_tools/packages/omega_h.py
@@ -29,9 +29,9 @@ def set_environment(self, builder):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
 
         CC = builder.env["CC"]
         CXX = builder.env["CXX"]

diff --git a/tpls/tpl_tools/packages/parmetis.py b/tpls/tpl_tools/packages/parmetis.py
@@ -21,14 +21,14 @@ def set_environment(self, builder):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
-            builder.add_option("-D=SHARED:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DSHARED:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
-            builder.add_option("-D=SHARED:BOOL=OFF")
-        builder.add_option("-D=GKLIB_PATH=./headers")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
+            builder.add_option("-DSHARED:BOOL=OFF")
+        builder.add_option("-DGKLIB_PATH=./headers")
         builder.add_option(
-            "-D=METIS_PATH=" + builder._registry.environment["METIS_DIR"]
+            "-DMETIS_PATH=" + builder._registry.environment["METIS_DIR"]
         )
 
     def register(self, builder):

diff --git a/tpls/tpl_tools/packages/scotch.py b/tpls/tpl_tools/packages/scotch.py
@@ -36,9 +36,9 @@ def set_environment(self, builder):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
 
         CC = builder.env["CC"]
         CXX = builder.env["CXX"]

diff --git a/tpls/tpl_tools/packages/seacas.py b/tpls/tpl_tools/packages/seacas.py
@@ -34,15 +34,15 @@ def set_environment(self, builder):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
-        builder.add_option("-D=TPL_ENABLE_Netcdf:BOOL=ON")
-        builder.add_option("-D=TPL_ENABLE_MPI:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
+        builder.add_option("-DTPL_ENABLE_Netcdf:BOOL=ON")
+        builder.add_option("-DTPL_ENABLE_MPI:BOOL=ON")
         if utils.check_for_x11(builder._extract_dir, builder.env["CC"]):
-            builder.add_option("-D=TPL_ENABLE_X11:BOOL=ON")
+            builder.add_option("-DTPL_ENABLE_X11:BOOL=ON")
         else:
-            builder.add_option("-D=TPL_ENABLE_X11:BOOL=OFF")
+            builder.add_option("-DTPL_ENABLE_X11:BOOL=OFF")
 
         CC = builder.env["CC"]
         CXX = builder.env["CXX"]

diff --git a/tpls/tpl_tools/packages/suitesparse.py b/tpls/tpl_tools/packages/suitesparse.py
@@ -24,13 +24,13 @@ def setDependencies(self, builder):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
-        builder.add_option("-D=BLAS_LIBRARIES=" + builder.env["BLAS_LIBRARIES"])
-        builder.add_option("-D=LAPACK_LIBRARIES=" + builder.env["LAPACK_LIBRARIES"])
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
+        builder.add_option("-DBLAS_LIBRARIES=" + builder.env["BLAS_LIBRARIES"])
+        builder.add_option("-DLAPACK_LIBRARIES=" + builder.env["LAPACK_LIBRARIES"] + ";" + builder.env["BLAS_LIBRARIES"])
         builder.add_option(
-            "-D=SUITESPARSE_ENABLE_PROJECTS=suitesparse_config;amd;camd;ccolamd;colamd;cholmod;umfpack"
+            "-DSUITESPARSE_ENABLE_PROJECTS=suitesparse_config;amd;camd;ccolamd;colamd;cholmod;umfpack"
         )
 
     def register(self, builder):

diff --git a/tpls/tpl_tools/packages/superlu_dist.py b/tpls/tpl_tools/packages/superlu_dist.py
@@ -30,12 +30,12 @@ def set_environment(self, builder):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
-        builder.add_option("-D=TPL_ENABLE_Netcdf:BOOL=ON")
-        builder.add_option("-D=TPL_ENABLE_MPI:BOOL=ON")
-        builder.add_option("-D=TPL_ENABLE_X11:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
+        builder.add_option("-DTPL_ENABLE_Netcdf:BOOL=ON")
+        builder.add_option("-DTPL_ENABLE_MPI:BOOL=ON")
+        builder.add_option("-DTPL_ENABLE_X11:BOOL=ON")
 
         CC = builder.env["CC"]
         CXX = builder.env["CXX"]

diff --git a/tpls/tpl_tools/packages/trilinos.py b/tpls/tpl_tools/packages/trilinos.py
@@ -32,9 +32,9 @@ def set_environment(self, builder):
 
     def configure_options(self, builder):
         if builder.build_shared:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=ON")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=ON")
         else:
-            builder.add_option("-D=BUILD_SHARED_LIBS:BOOL=OFF")
+            builder.add_option("-DBUILD_SHARED_LIBS:BOOL=OFF")
         CC = builder.env["CC"]
         CXX = builder.env["CXX"]
         FC = builder.env["FC"]