Win32: Fix CAFS issues wrt CMake-3.13+ #561
Conversation
After upgrading cmake to 3.13.2, I found some new issues with the CAFS logic as used by Jayenne. This commit attempts to fix those issues. + The search for MS-MPI from a MinGW Makefile project (GNU Fortran) now fails because a simple C program that links to libmpi.a fails. The failure is expected w/o extra work on our part. I needed to interrupt the build logic for this unique case so that the build system still reports MPI as 'found.' + Store the value of `MPI_C_WORKS` as discovered by the master build (e.g. Visual Studio) in `draco-config.cmake`. + Using the above variable along with the values of `WIN32`, `MPI_C_LIBRARIES`, and `CMAKE_GENERATOR`, allow the `FindMPI` command to return `TRUE` in very special circumstances. + Minor formatting teaks.
KineticTheory
changed the title
Codecov Report
@@ Coverage Diff @@
## develop #561 +/- ##
=========================================
+ Coverage 93.3% 93.6% +0.3%
=========================================
Files 377 377
Lines 17676 17608 -68
=========================================
+ Hits 16496 16498 +2
+ Misses 1180 1110 -70 |
|
@clevelam All CDash test pass. This is ready for final review and merge. |
| if( NOT "${MPI_C_FOUND}" AND "${Draco_MPI_C_WORKS}" | ||
| AND "${MPI_C_LIBRARIES}" MATCHES "msmpi" | ||
| AND "${CMAKE_GENERATOR}" STREQUAL "MinGW Makefiles") | ||
| if( EXISTS "${MPI_C_LIBRARIES}" AND EXISTS "${MPI_C_INCLUDE_DIRS}" ) |
There was a problem hiding this comment.
This logic seems complicated it. Can it be simplified to set both the variables true only on the existence of the MPI libraries and directories?
There was a problem hiding this comment.
Yes -- it is very complicated because I need to work around a bug in cmake. I think I can eliminate the first two checks. I'll try do do this -- but it may break the no-MPI build.
config/unix-g++.cmake
Outdated
| #check_cxx_compiler_flag( "-Wunused-macros" HAS_WUNUSED_MACROS ) | ||
| check_cxx_compiler_flag( "-Wzero-as-null-pointer-constant" HAS_WZER0_AS_NULL_POINTER_CONSTANT ) | ||
| check_cxx_compiler_flag( "-Wzero-as-null-pointer-constant" | ||
| HAS_WZER0_AS_NULL_POINTER_CONSTANT ) |
There was a problem hiding this comment.
Is this really spelled ZER'0' with the number 0 not ZERO with the letter o? that seems strange.
There was a problem hiding this comment.
I'll fix this. Actually, I will fix the spelling and comment out the check as it is currently unused.
Background
Description of changes
MPI_C_WORKSas discovered by the master build (e.g. Visual Studio) indraco-config.cmake.WIN32,MPI_C_LIBRARIES, andCMAKE_GENERATOR, allow theFindMPIcommand to returnTRUEin very special circumstances.Status