Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Flatten pr 697 into one changeset. #723

Closed
wants to merge 9 commits into from
Closed

Conversation

KineticTheory
Copy link
Collaborator

Background

Purpose of Pull Request

Description of changes

  • item

Status

+ Add some debug output to `CMakeAddFortranSubdirectory`.  This should only be active if the local macro variable `verbose` is `true`.
+ Update `print_target_properties` to print target values related to file LOCATIONS.
+ Update how MPI is discovered for VS2019 builds that provide msmpi via vcpkg.  Also add some debug prints that can optionally be enabled.  Tested with MS-MPI 10.0.
+ Update `vendor_libraries` to correctly create imported targets for openblas for VS2019.  openblas can be installed via vcpkg.
+ The f90sub Fortran package is built via CAFS under VS2019 (with MSYS2 MinGW's gfortran).  Newer CMake (3.16.1) and MS-MPI (10.0) behave a little different that the older versions and extra logic was needed to correctly point to the MPI libraries. (Also, start using a target property to ensure the generated library is installed in the correct location.)
+ When TPLs are provided by vcpkg, we use a `CMAKE_TOOLCHAIN_FILE`. Ensure that this information is passed to the CAFS sub-project.
+ Remove unnecessary DLL_PUBLIC decoration from `fc_derivided_type.cc`.
+ Remove double underscores from CPP names in lapack_wrap.
+ Update the `quadrature/CMakeLists.txt` portions related to CAFS so they match the commands used in `FortranChecks`.
@KineticTheory KineticTheory added this to the Draco-7_5_0 milestone Jan 10, 2020
@KineticTheory KineticTheory self-assigned this Jan 10, 2020
+ Also remove duplicate linear_interpolate_3 function.
+ In `CMakeAddFortranSubdirectory.cmake`, only munge MPI settings if
  `DRACO_C4=MPI`.
+ In `windows-cl.cmake`:
  - Use `CMAKE_SIZEOF_VOID_P` instead of `CMAKE_CL_64` as recommended by CMake.
  - Make searching for `ws2_32.lib` more robust by searching in more locations
    and exiting the seearch loop once found.
+ In `FortranChecks/test/CMakeLists.txt`, make the search for
  `libquadmath-0.dll` more robust.
+ Fix some comparisons between signed and unsigned integral values in
  `RTT_Format_Reader` and in `mdpsan`'s implementation.
+ Suppress a warning about unreachable code in `C4_Serial.cc`.
@KineticTheory
Copy link
Collaborator Author

This is no longer needed now that #725 was merged.

@KineticTheory KineticTheory deleted the cpeloss branch January 16, 2020 03:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant