Skip to content

Commit

Permalink
Add generic MPI pkgconfig configurations
Browse files Browse the repository at this point in the history
  • Loading branch information
eschnett committed Jul 16, 2022
1 parent a7923b3 commit 0bef491
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ authors:
given-names: Erik
orcid: 0000-0002-4518-9017
title: MPItrampoline
version: v4.1.2
version: v4.2.0
doi: 10.5281/zenodo.6174408
date-released: 2022-07-11
15 changes: 13 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.12...3.20)
project(
MPItrampoline VERSION 4.1.2
MPItrampoline VERSION 4.2.0
DESCRIPTION "MPI trampoline"
HOMEPAGE_URL "https://github.com/eschnett/MPItrampoline"
LANGUAGES NONE
Expand Down Expand Up @@ -269,8 +269,19 @@ install(
)

configure_file(MPItrampoline.pc.in MPItrampoline.pc @ONLY)
configure_file(mpi-c.pc.in mpi-c.pc @ONLY)
configure_file(mpi-cxx.pc.in mpi-cxx.pc @ONLY)
configure_file(mpi-fort.pc.in mpi-fort.pc @ONLY)
install(
FILES ${CMAKE_BINARY_DIR}/MPItrampoline.pc
FILES
${CMAKE_BINARY_DIR}/MPItrampoline.pc
${CMAKE_BINARY_DIR}/mpi-c.pc
${CMAKE_BINARY_DIR}/mpi-cxx.pc
${CMAKE_BINARY_DIR}/mpi-fort.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
install(
FILES ${CMAKE_BINARY_DIR}/mpi-c.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)

Expand Down
15 changes: 15 additions & 0 deletions mpi-c.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@

Name: @PROJECT_NAME@
Description: @PROJECT_DESCRIPTION@
URL: @CMAKE_PROJECT_HOMEPAGE_URL@
Version: @PROJECT_VERSION@

Requires:
Requires.private:
Cflags: -I${includedir}
Libs: -L${libdir} -Wl,-rpath,${libdir} -lmpitrampoline
Libs.private: -ldl
17 changes: 17 additions & 0 deletions mpi-cxx.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@

Name: @PROJECT_NAME@
Description: @PROJECT_DESCRIPTION@
URL: @CMAKE_PROJECT_HOMEPAGE_URL@
Version: @PROJECT_VERSION@

Requires:
Requires.private:
Cflags: -I${includedir}
Libs: -L${libdir} -Wl,-rpath,${libdir} -lmpitrampoline
Libs.private: -ldl

cxxflags=-I${includedir}
18 changes: 18 additions & 0 deletions mpi-fort.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@

Name: @PROJECT_NAME@
Description: @PROJECT_DESCRIPTION@
URL: @CMAKE_PROJECT_HOMEPAGE_URL@
Version: @PROJECT_VERSION@

Requires:
Requires.private:
Cflags: -I${includedir}
Libs: -L${libdir} -Wl,-rpath,${libdir} -lmpitrampoline
Libs.private: -ldl

fflags=@CMAKE_Fortran_FLAGS@ -I${includedir}
fcflags=@CMAKE_Fortran_FLAGS@ -I${includedir}
4 changes: 2 additions & 2 deletions mpiabi/mpi_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@
("int", "MPI_SEEK_SET"),

# Thread support
("int", "MPI_THREAD_SINGLE"),
("int", "MPI_THREAD_FUNNELED"),
("int", "MPI_THREAD_SERIALIZED"),
("int", "MPI_THREAD_MULTIPLE"),
("int", "MPI_THREAD_SERIALIZED"),
("int", "MPI_THREAD_SINGLE"),

# File operation constants
("int", "MPI_TYPECLASS_COMPLEX"),
Expand Down

0 comments on commit 0bef491

Please sign in to comment.