Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 08:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve PMIx Package Finding on Debian

Browse Source 
Debian's libpmix-dev package installs everything below
/usr/lib/ARCH-TRIPLET/pmix2.
For some reasoning behind this,
see: https://bugs.debian.org/882033

CMake does not search there by default, so help it.

Also add myself to CONTRIBUTORS.
This commit is contained in:
Christian Tacke 2020-10-08 16:34:28 +02:00 committed by Dennis Klein
parent 0e5978b160
commit 7edf436919
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -8,5 +8,6 @@ Lebedev, Andrey
Mrnjavac, Teo <teo.m@cern.ch> Mrnjavac, Teo <teo.m@cern.ch>
Neskovic, Gvozden Neskovic, Gvozden
Richter, Matthias Richter, Matthias
Tacke, Christian
Uhlig, Florian Uhlig, Florian
Wenzel, Sandro Wenzel, Sandro

15
cmake/FindPMIx.cmake
View File

@ -6,28 +6,35 @@
# copied verbatim in the file "LICENSE" # # copied verbatim in the file "LICENSE" #
################################################################################ ################################################################################
# The "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pmix" part in all
# the PATH_SUFFIXES is here to be able to find Debian's
# libpmix-dev package. It installs everything below
# /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/pmix
find_path(PMIx_INCLUDE_DIR find_path(PMIx_INCLUDE_DIR
NAMES pmix.h NAMES pmix.h
HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT} HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT}
PATH_SUFFIXES include PATH_SUFFIXES include lib/${CMAKE_LIBRARY_ARCHITECTURE}/pmix/include
) )
find_path(PMIx_LIBRARY_DIR find_path(PMIx_LIBRARY_DIR
NAMES libpmix.dylib libpmix.so NAMES libpmix.dylib libpmix.so
HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT} HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT}
PATH_SUFFIXES lib lib64 PATH_SUFFIXES lib lib64 lib/${CMAKE_LIBRARY_ARCHITECTURE}/pmix/lib
) )
find_library(PMIx_LIBRARY_SHARED find_library(PMIx_LIBRARY_SHARED
NAMES libpmix.dylib libpmix.so NAMES libpmix.dylib libpmix.so
HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT} HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT}
PATH_SUFFIXES lib lib64 PATH_SUFFIXES lib lib64 lib/${CMAKE_LIBRARY_ARCHITECTURE}/pmix/lib
) )
find_file(PMIx_VERSION_FILE find_file(PMIx_VERSION_FILE
NAMES pmix_version.h NAMES pmix_version.h
HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT} HINTS ${PMIX_ROOT} $ENV{PMIX_ROOT}
PATH_SUFFIXES include PATH_SUFFIXES include lib/${CMAKE_LIBRARY_ARCHITECTURE}/pmix/include
) )
file(READ "${PMIx_VERSION_FILE}" __version_raw) file(READ "${PMIx_VERSION_FILE}" __version_raw)