diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-02 12:47:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-11-02 12:48:12 (GMT) |
| commit | e7fa6d45d45007f07b6f7a2ae2cce5976133c161 (patch) | |
| tree | 70c3df83c55b46bf4137828b4d76de38c3114b17 | |
| parent | 7ad6c1afd6bef3cf69c78ac2bab0ffa8eab5bea7 (diff) | |
| parent | 56d949f05f37c65401825a30be0d39bd152cc33c (diff) | |
| download | CMake-e7fa6d45d45007f07b6f7a2ae2cce5976133c161.zip CMake-e7fa6d45d45007f07b6f7a2ae2cce5976133c161.tar.gz CMake-e7fa6d45d45007f07b6f7a2ae2cce5976133c161.tar.bz2 | |
Merge topic 'FindMPI-pkg-config' into release-3.22
56d949f05f FindMPI: Fix finding PkgConfg for fallback
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6685
| -rw-r--r-- | Modules/FindMPI.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 62412ae..c974d33 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -267,7 +267,7 @@ cmake_policy(PUSH) cmake_policy(SET CMP0057 NEW) # if IN_LIST include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/FindPkgConfig.cmake) +find_package(PkgConfig QUIET) # Generic compiler names set(_MPI_C_GENERIC_COMPILER_NAMES mpicc mpcc mpicc_r mpcc_r) @@ -1583,7 +1583,7 @@ foreach(LANG IN ITEMS C CXX Fortran) else() set(_MPI_PKG "") endif() - if(_MPI_PKG) + if(_MPI_PKG AND PKG_CONFIG_FOUND) pkg_check_modules("MPI_${LANG}_PKG" "${_MPI_PKG}") if("${MPI_${LANG}_PKG_FOUND}") set(MPI_${LANG}_COMPILE_OPTIONS ${MPI_${LANG}_PKG_CFLAGS} CACHE STRING "MPI ${LANG} compilation options" FORCE) |