From d72d9c34b5af13f50aa320fb0a6a2a27d945cdb2 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Mar 28 2017 16:35:53 +0000 Subject: tweaks for epel7 --- diff --git a/legion.spec b/legion.spec index ca260f5..709987d 100644 --- a/legion.spec +++ b/legion.spec @@ -14,7 +14,7 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: hwloc-devel BuildRequires: gasnet-devel -BuildRequires: cmake +BuildRequires: %{?fedora:cmake >= 3.1}%{?rhel:cmake3 >= 3.1} %description Legion is a data-centric parallel programming system for writing portable @@ -104,7 +104,7 @@ mkdir serial openmpi mpich pushd serial export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" -%{cmake} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=OFF -DLegion_BUILD_EXAMPLES=ON -DLegion_BUILD_TESTS=ON -DLegion_BUILD_TUTORIAL=ON \ +%{?fedora:%{cmake}}%{?rhel:%{cmake3}} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=OFF -DLegion_BUILD_EXAMPLES=ON -DLegion_BUILD_TESTS=ON -DLegion_BUILD_TUTORIAL=ON \ -DLegion_BUILD_TESTS=ON -DLegion_BUILD_TUTORIAL=ON -DLegion_ENABLE_TESTING=ON %make_build popd @@ -112,7 +112,7 @@ popd pushd openmpi %{_openmpi_load} export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" -%{cmake} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=ON -DLegion_BUILD_EXAMPLES=ON -DCMAKE_INSTALL_LIBDIR=${MPI_LIB} -DGASNet_CONDUIT=mpi \ +%{?fedora:%{cmake}}%{?rhel:%{cmake3}} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=ON -DLegion_BUILD_EXAMPLES=ON -DCMAKE_INSTALL_LIBDIR=${MPI_LIB} -DGASNet_CONDUIT=mpi \ -DGASNet_mpi-par_LIBRARY=${MPI_LIB}/libgasnet-mpi-par.so -DGASNet_gasnet_tools-par_LIBRARY=$MPI_LIB/libgasnet_tools-par.so -DGASNet_INCLUDE_DIR=$MPI_INCLUDE \ -DLegion_BUILD_TESTS=ON -DLegion_BUILD_TUTORIAL=ON -DLegion_ENABLE_TESTING=ON %make_build @@ -122,7 +122,7 @@ popd pushd mpich %{_mpich_load} export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" -%{cmake} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=ON -DLegion_BUILD_EXAMPLES=ON -DCMAKE_INSTALL_LIBDIR=${MPI_LIB} -DGASNet_CONDUIT=mpi \ +%{?fedora:%{cmake}}%{?rhel:%{cmake3}} .. -DLegion_USE_HWLOC=ON -DLegion_USE_GASNet=ON -DLegion_BUILD_EXAMPLES=ON -DCMAKE_INSTALL_LIBDIR=${MPI_LIB} -DGASNet_CONDUIT=mpi \ -DGASNet_mpi-par_LIBRARY=${MPI_LIB}/libgasnet-mpi-par.so -DGASNet_gasnet_tools-par_LIBRARY=$MPI_LIB/libgasnet_tools-par.so -DGASNet_INCLUDE_DIR=$MPI_INCLUDE \ -DLegion_BUILD_TESTS=ON -DLegion_BUILD_TUTORIAL=ON -DLegion_ENABLE_TESTING=ON %make_build