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

Fix some Win32 issues related to CAFS. #649

Merged
merged 2 commits into from
Jul 25, 2019
Merged

Conversation

KineticTheory
Copy link
Collaborator

@KineticTheory KineticTheory commented Jul 25, 2019

Background

  • CAFS stopped working recently for one client project. The main issue is that FindMPI was failing for a MInGW Makefile project spawned from a MSVC project. It is unclear what changed to cause this UseCase to fail, but it is likely that updating the CMake version was the issue.
  • A new warning LNK4099 is also being issued when pdb files for TPLs aren't found. I will suppress this warning as a link flag.

Description of changes

  • When defining an import library as used by CAFS, look for the lib in the project build directory, but look for the dll in the ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}.
  • When setting up C4 variables, allow MPI to remain active if either MPI_CXX_FOUND or MPI_C_FOUND are true. This allows cmake projects that use C but not C++ to work properly.

Status

@KineticTheory KineticTheory added this to the Draco-7_3_0 milestone Jul 25, 2019
@KineticTheory KineticTheory self-assigned this Jul 25, 2019
@KineticTheory
Copy link
Collaborator Author

@alexrlongne This one can also be merged when you have time to look at it.

@alexrlongne alexrlongne merged commit d5d191a into lanl:develop Jul 25, 2019
KineticTheory added a commit to KineticTheory/Draco that referenced this pull request Aug 1, 2019
Recent versions of MSVC have starting issuing warnings when the `.dbg` file
associated with a library isn't found when linking Debug code.  I thought this
issue was restricted to libeospac.lib, but it turns out other TPLs also
cause this warning to be emitted.

I'm pulling the change to `cdi_eospac/CMakeLists.txt` that I made in lanl#649 and
replacing it by moving the `ignore` link flag to the global `LINK_OPTIONS`
CMake variable.
@KineticTheory KineticTheory mentioned this pull request Aug 1, 2019
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants