Skip to content

Commit d0aff48

Browse files
awlauriaawlauria
authored
Merge pull request #4737 from ggouaillardet/topic/oshmem_pkgconfig
oshmem: add pkg-config files
2 parents ee58edc + 4994090 commit d0aff48

File tree

6 files changed

+104
-2
lines changed

6 files changed

+104
-2
lines changed

‎config/oshmem_config_files.m4

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Copyright (c) 2013 Mellanox Technologies, Inc.
44
# All rights reserved.
55
# Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
6-
# Copyright (c) 2017 Research Organization for Information Science
7-
# and Technology (RIST). All rights reserved.
6+
# Copyright (c) 2017-2018 Research Organization for Information Science
7+
# and Technology (RIST). All rights reserved.
88
# $COPYRIGHT$
99
#
1010
# Additional copyrights may follow
@@ -27,5 +27,9 @@ AC_DEFUN([OSHMEM_CONFIG_FILES],[
2727
oshmem/tools/wrappers/shmemcc-wrapper-data.txt
2828
oshmem/tools/wrappers/shmemc++-wrapper-data.txt
2929
oshmem/tools/wrappers/shmemfort-wrapper-data.txt
30+
oshmem/tools/wrappers/oshmem.pc
31+
oshmem/tools/wrappers/oshmem-c.pc
32+
oshmem/tools/wrappers/oshmem-cxx.pc
33+
oshmem/tools/wrappers/oshmem-fort.pc
3034
])
3135
])

‎oshmem/tools/wrappers/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ man_pages = oshcc.1 shmemcc.1 oshc++.1 shmemc++.1 oshcxx.1 shmemcxx.1 oshfort.1
1717
if PROJECT_OSHMEM
1818
man_MANS = $(man_pages)
1919

20+
pkgconfigdir = $(libdir)/pkgconfig
21+
pkgconfig_DATA = oshmem.pc oshmem-c.pc oshmem-cxx.pc oshmem-fort.pc
22+
2023
nodist_oshmemdata_DATA = \
2124
shmemcc-wrapper-data.txt \
2225
shmemc++-wrapper-data.txt \

‎oshmem/tools/wrappers/oshmem-c.pc.in

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
2+
# Copyright (c) 2016 IBM Corporation. All rights reserved.
3+
# Copyright (c) 2018 Research Organization for Information Science
4+
# and Technology (RIST). All rights reserved.
5+
#
6+
Name: Open SHMEM
7+
Description: Open MPI based Open SHMEM implementation
8+
Version: @OSHMEM_VERSION@
9+
URL: http://www.open-mpi.org/
10+
#
11+
prefix=@prefix@
12+
exec_prefix=@exec_prefix@
13+
includedir=@includedir@
14+
libdir=@libdir@
15+
pkgincludedir=@opalincludedir@
16+
#
17+
# Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
18+
# static linking (they're pulled in by libopen-rte.so's implicit
19+
# dependencies), so only list these in Libs.private.
20+
#
21+
Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -loshmem -l@OMPI_LIBMPI_NAME@
22+
Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
23+
#
24+
Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@

‎oshmem/tools/wrappers/oshmem-cxx.pc.in

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
2+
# Copyright (c) 2016 IBM Corporation. All rights reserved.
3+
# Copyright (c) 2018 Research Organization for Information Science
4+
# and Technology (RIST). All rights reserved.
5+
#
6+
Name: Open SHMEM
7+
Description: Open MPI based Open SHMEM implementation
8+
Version: @OSHMEM_VERSION@
9+
URL: http://www.open-mpi.org/
10+
#
11+
prefix=@prefix@
12+
exec_prefix=@exec_prefix@
13+
includedir=@includedir@
14+
libdir=@libdir@
15+
pkgincludedir=@opalincludedir@
16+
#
17+
# Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
18+
# static linking (they're pulled in by libopen-rte.so's implicit
19+
# dependencies), so only list these in Libs.private.
20+
#
21+
Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_WRAPPER_CXX_LIB@ -loshmem -l@OMPI_LIBMPI_NAME@
22+
Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
23+
#
24+
Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CXXFLAGS@

‎oshmem/tools/wrappers/oshmem-fort.pc.in

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
2+
# Copyright (c) 2016 IBM Corporation. All rights reserved.
3+
# Copyright (c) 2018 Research Organization for Information Science
4+
# and Technology (RIST). All rights reserved.
5+
#
6+
Name: Open SHMEM
7+
Description: Open MPI based Open SHMEM implementation
8+
Version: @OSHMEM_VERSION@
9+
URL: http://www.open-mpi.org/
10+
#
11+
prefix=@prefix@
12+
exec_prefix=@exec_prefix@
13+
includedir=@includedir@
14+
libdir=@libdir@
15+
pkgincludedir=@opalincludedir@
16+
#
17+
# Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
18+
# static linking (they're pulled in by libopen-rte.so's implicit
19+
# dependencies), so only list these in Libs.private.
20+
#
21+
Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -loshmem -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
22+
Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
23+
Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@

‎oshmem/tools/wrappers/oshmem.pc.in

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
2+
# Copyright (c) 2016 IBM Corporation. All rights reserved.
3+
# Copyright (c) 2018 Research Organization for Information Science
4+
# and Technology (RIST). All rights reserved.
5+
#
6+
Name: Open SHMEM
7+
Description: Open MPI based Open SHMEM implementation
8+
Version: @OSHMEM_VERSION@
9+
URL: http://www.open-mpi.org/
10+
#
11+
prefix=@prefix@
12+
exec_prefix=@exec_prefix@
13+
includedir=@includedir@
14+
libdir=@libdir@
15+
pkgincludedir=@opalincludedir@
16+
#
17+
# Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
18+
# static linking (they're pulled in by libopen-rte.so's implicit
19+
# dependencies), so only list these in Libs.private.
20+
#
21+
Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -loshmem -l@OMPI_LIBMPI_NAME@
22+
Libs.private: @OMPI_WRAPPER_EXTRA_LIBS@
23+
#
24+
Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@

0 commit comments

Comments
 (0)