From 8fc630377c707fe72d3e20c5872818b771c3ff59 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jul 29 2020 08:09:26 +0000 Subject: Use %cmake_build/%cmake_install --- diff --git a/gmsh.spec b/gmsh.spec index 78db035..0455ad7 100644 --- a/gmsh.spec +++ b/gmsh.spec @@ -1,4 +1,3 @@ -%global __cmake_in_source_build 1 %bcond_without openmpi %bcond_without mpich @@ -248,7 +247,7 @@ LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake .. \ -DENABLE_OPENMP=ON \ $gmsh_cmake_args -%make_build +%cmake_build popd ### openmpi version ### @@ -264,7 +263,7 @@ LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake .. \ -DCMAKE_INSTALL_INCLUDEDIR=$MPI_INCLUDE \ $gmsh_cmake_args -%make_build +%cmake_build popd %{_openmpi_unload} %endif @@ -282,7 +281,7 @@ LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake .. \ -DCMAKE_INSTALL_INCLUDEDIR=$MPI_INCLUDE \ $gmsh_cmake_args -%make_build +%cmake_build popd %{_mpich_unload} %endif @@ -302,12 +301,12 @@ cp -a Parser/Gmsh.* build-mpich %install %if %{with openmpi} -%make_install -C build-openmpi +(cd build-openmpi && %cmake_install) %endif %if %{with mpich} -%make_install -C build-mpich +(cd build-mpich && %cmake_install) %endif -%make_install -C build-serial +(cd build-serial && %cmake_install) # Remove static libraries find %{buildroot} -type f -name libgmsh.a -exec rm -f {} \;