This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 01c7c4236af7646c6b6db0a8a0d0e355b58c5bf2 (commit)
via 31b8b28fedbf102740eebd7ff9148188ed00a26e (commit)
from a04b852a7b1c8590ad35db5d09c99e73ebd5e464 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01c7c4236af7646c6b6db0a8a0d0e355b58c5bf2
commit 01c7c4236af7646c6b6db0a8a0d0e355b58c5bf2
Merge: a04b852 31b8b28
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 21 14:28:21 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Aug 21 10:28:33 2019 -0400
Merge topic 'FindMPI-restore-flag-vars'
31b8b28fed FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS and
MPI_<LANG>_COMPILE_OPTIONS
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3710
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31b8b28fedbf102740eebd7ff9148188ed00a26e
commit 31b8b28fedbf102740eebd7ff9148188ed00a26e
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Tue Aug 20 17:38:53 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Aug 21 10:08:12 2019 -0400
FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS and MPI_<LANG>_COMPILE_OPTIONS
In commit e374b9f1eb (FindMPI: Restore MPI_<LANG>_COMPILE_FLAGS as a
command-line string, 2018-09-10, v3.12.3~6^2) we tried to restore the
compile flags but accidentally inverted the arguments to `list(JOIN)`
causing both `MPI_<LANG>_COMPILE_FLAGS` and `MPI_<LANG>_COMPILE_OPTIONS`
to be empty.
Issue: #18349
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 9471be8..2b9b20c 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -1698,7 +1698,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
set(MPI_${LANG}_INCLUDE_PATH "${MPI_${LANG}_INCLUDE_DIRS}")
unset(MPI_${LANG}_COMPILE_FLAGS)
if(MPI_${LANG}_COMPILE_OPTIONS)
- list(JOIN MPI_${LANG}_COMPILE_FLAGS " " MPI_${LANG}_COMPILE_OPTIONS)
+ list(JOIN MPI_${LANG}_COMPILE_OPTIONS " " MPI_${LANG}_COMPILE_FLAGS)
endif()
if(MPI_${LANG}_COMPILE_DEFINITIONS)
foreach(_MPI_DEF IN LISTS MPI_${LANG}_COMPILE_DEFINITIONS)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindMPI.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
