Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v5.0.x: wrappers: install the pkgconfig scripts better #12628

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions ompi/tools/wrappers/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,21 @@
# $HEADER$
#

if OPAL_INSTALL_BINARIES
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ompi.pc ompi-c.pc

if OMPI_HAVE_CXX_COMPILER
pkgconfig_DATA += ompi-cxx.pc
endif

if OMPI_HAVE_FORTRAN_COMPILER
pkgconfig_DATA += ompi-fort.pc
endif
endif # OPAL_INSTALL_BINARIES

#-----------------

if OPAL_WANT_SCRIPT_WRAPPER_COMPILERS

bin_SCRIPTS = ompi_wrapper_script
Expand Down Expand Up @@ -70,17 +85,6 @@ else # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS

if OPAL_INSTALL_BINARIES

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ompi.pc ompi-c.pc

if OMPI_HAVE_CXX_COMPILER
pkgconfig_DATA += ompi-cxx.pc
endif

if OMPI_HAVE_FORTRAN_COMPILER
pkgconfig_DATA += ompi-fort.pc
endif

if OMPI_WANT_JAVA_BINDINGS
bin_SCRIPTS = mpijavac.pl
endif
Expand Down
Loading