Added CMAKE_PREFIX_PATH to the module file

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
Create included and cmake directories for OpenMPI package files
2023-10-12 09:56:55 +02:00 · 2023-10-12 09:55:45 +02:00 · 2023-10-12 09:51:39 +02:00 · 2023-09-25 12:35:33 -05:00
2 changed files with 17 additions and 1 deletions
--- a/openmpi.module.in
+++ b/openmpi.module.in
@ -6,6 +6,7 @@ conflict		mpi
 prepend-path 		PATH 		@LIBDIR@/bin
 prepend-path 		LD_LIBRARY_PATH @LIBDIR@/lib
 prepend-path 		PKG_CONFIG_PATH	@LIBDIR@/lib/pkgconfig
+prepend-path 		CMAKE_PREFIX_PATH	@LIBDIR@
 prepend-path		MANPATH		:@MANDIR@
 setenv 			MPI_BIN		@LIBDIR@/bin
 setenv			MPI_SYSCONFIG	@ETCDIR@
--- a/openmpi.spec
+++ b/openmpi.spec
@ -59,7 +59,7 @@

 Name:           openmpi%{?_cc_name_suffix}
 Version:        4.1.5
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Open Message Passing Interface
 License:        BSD and MIT and Romio
 URL:            http://www.open-mpi.org/
@ -287,6 +287,10 @@ cd -
 # Create cmake dir
 mkdir -p %{buildroot}%{_libdir}/%{name}/lib/cmake/

+# Create directories for OpenMPI packages with development files
+mkdir -p %{buildroot}%{_libdir}/%{name}/lib/openmpi/cmake
+mkdir -p %{buildroot}%{_libdir}/%{name}/include
+
 # Remove extraneous wrapper link libraries (bug 814798)
 sed -i -e s/-ldl// -e s/-lhwloc// \
  %{buildroot}%{_libdir}/%{name}/share/openmpi/*-wrapper-data.txt
@ -309,6 +313,8 @@ make check
 %dir %{_libdir}/%{name}/bin
 %dir %{_libdir}/%{name}/lib
 %dir %{_libdir}/%{name}/lib/openmpi
+%dir %{_libdir}/%{name}/lib/openmpi/cmake
+%dir %{_libdir}/%{name}/include
 %dir %{_mandir}/%{namearch}
 %dir %{_mandir}/%{namearch}/man*
 %config(noreplace) %{_sysconfdir}/%{namearch}/*
@ -406,6 +412,15 @@ make check


 %changelog
+* Thu Oct 12 2023 Cristian Le <fedora@lecris.me> - 4.1.5-8
+- Added CMAKE_PREFIX_PATH to module file
+
+* Sat Sep 30 2023 Benson Muite <benson_muite@emailplus.org>
+- Add include and cmake directories for development files for OpenMPI packages
+
+* Mon Sep 25 2023 Michel Lind <salimma@fedoraproject.org> - 4.1.5-7
+- Actually rebuild against pmix 4.1.3
+
 * Fri Sep 22 2023 Orion Poplawski <orion@nwra.com> - 4.1.5-6
 - Rebuild for pmix 4.1.3 (bz#2240042)
Author	SHA1	Message	Date
Cristian Le	f61e50f9bd	Added CMAKE_PREFIX_PATH to the module file Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>	2023-10-12 09:56:55 +02:00
Benson Muite	14c10a1b57	Create included and cmake directories for OpenMPI package files	2023-10-12 09:55:45 +02:00
Benson Muite	da92aacb6a	OpenMPI should own cmake and include install directories Make sure that packages which install cmake and include files in OpenMPI locations do not need to own the main directories for OpenMPI. See https://download.copr.fedorainfracloud.org/results/fed500/gloo/fedora-rawhide-x86_64/06467673-gloo/fedora-review/review.txt	2023-10-12 09:51:39 +02:00
Michel Lind	7344cefb3d	Actually rebuild against pmix 4.1.3 Signed-off-by: Michel Lind <salimma@fedoraproject.org>	2023-09-25 12:35:33 -05:00