From a5377cca512c23b8093bb66fc7ea0ace12159a98 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sep 09 2016 21:55:18 +0000 Subject: Use CMAKE_PREFIX_PATH to find mpi versions of libraries --- diff --git a/paraview.spec b/paraview.spec index f9a6177..9c227f1 100644 --- a/paraview.spec +++ b/paraview.spec @@ -187,7 +187,6 @@ Provides: bundled(xdmf2) -DVTK_USE_SYSTEM_ICET=OFF \\\ -DVTK_USE_SYSTEM_LIBRARIES=ON \\\ -DVTK_USE_SYSTEM_HDF5=ON \\\ - -DHDF5_HL_LIBRARY:FILEPATH=%{_libdir}/libhdf5_hl.so \\\ -DVTK_USE_SYSTEM_AUTOBAHN:BOOL=ON \\\ %{?vtk_use_system_jsoncpp} \\\ -DVTK_USE_SYSTEM_LIBPROJ4=OFF \\\ @@ -377,7 +376,8 @@ mkdir fedora-openmpi pushd fedora-openmpi %{_openmpi_load} cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/openmpi \ + -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ + -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/paraview \ -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib/paraview \ -DVTK_INSTALL_LIBRARY_DIR:PATH=lib/paraview \ @@ -401,7 +401,8 @@ pushd fedora-mpich # https://bugzilla.redhat.com/show_bug.cgi?id=1148992 [ -z "$PYTHONPATH" ] && export PYTHONPATH=$MPI_PYTHON_SITEARCH cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_libdir}/mpich \ + -DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \ + -DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \ -DVTK_INSTALL_INCLUDE_DIR:PATH=include/paraview \ -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib/paraview \ -DVTK_INSTALL_LIBRARY_DIR:PATH=lib/paraview \ @@ -571,6 +572,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog * Wed Aug 10 2016 Orion Poplawski - 5.1.2-1 - Update to 5.1.2 +- Use CMAKE_PREFIX_PATH to find mpi versions of libraries * Wed Jun 29 2016 Orion Poplawski - 5.1.0-1.1 - Rebuild for hdf5 1.8.17