diff options
| -rw-r--r-- | lammps.spec | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lammps.spec b/lammps.spec index c8efdcb..1b501cb 100644 --- a/lammps.spec +++ b/lammps.spec @@ -181,7 +181,7 @@ mkdir build && cd build for mpi in '' mpich %{?with_openmpi:openmpi} ; do test -n "${mpi}" && module load mpi/${mpi}-%{_arch} #python wrapper isn't mpi specific - %cmake3 ../cmake \ + %{cmake3} ../cmake \ -C ../cmake/presets/all_on.cmake \ -C ../cmake/presets/nolib.cmake \ %{cmake_blas_flags} \ @@ -207,13 +207,10 @@ for mpi in '' mpich %{?with_openmpi:openmpi} ; do %ifnarch x86_64 %x86 -DPKG_INTEL=OFF \ %endif - -DLAMMPS_MACHINE=${mpi:-serial} -DLAMMPS_LIB_SUFFIX=${mpi:-serial} \ - -DCMAKE_INSTALL_BINDIR=%{_bindir} \ - -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ - -DCMAKE_INSTALL_MANDIR=%{_mandir} \ + -DCMAKE_INSTALL_BINDIR=${MPI_BIN:-%{_bindir}} -DCMAKE_INSTALL_LIBDIR=${MPI_LIB:-%{_libdir}} -DLAMMPS_MACHINE="${MPI_SUFFIX#_}" -DLAMMPS_LIB_SUFFIX="${MPI_SUFFIX#_}" -DCMAKE_INSTALL_MANDIR=${MPI_MAN:-%{_mandir}} \ ${mpi:+-DBUILD_MPI=ON -DFFT_USE_HEFFTE=ON -DCMAKE_EXE_LINKER_FLAGS="%{__global_ldflags} -Wl,-rpath -Wl,${MPI_LIB} -Wl,--enable-new-dtags" -DCMAKE_SHARED_LINKER_FLAGS="%{__global_ldflags} -Wl,-rpath -Wl,${MPI_LIB} -Wl,--enable-new-dtags" $(test "$mpi" != openmpi || echo "-DMPIEXEC_PREFLAGS=--oversubscribe") } \ $(test -z "${mpi}" && echo -DBUILD_MPI=OFF -DBUILD_LAMMPS_SHELL=ON -DBUILD_TOOLS=ON) - cmake --build . -j8 + cmake --build . -j8 test -n "${mpi}" && module unload mpi/${mpi}-%{_arch} done @@ -227,7 +224,7 @@ set +e set -e for mpi in '' mpich %{?with_openmpi:openmpi} ; do - %make_install + make install done cd ../python |