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 GSL discovery. #483

Merged
merged 1 commit into from
Sep 25, 2018
Merged

Conversation

KineticTheory
Copy link
Collaborator

@KineticTheory KineticTheory commented Sep 25, 2018

Background

  • Newer GSL installs on Windows provide gsl-config.cmake that should be used to create the GSL import targets instead of attempting to use the CMake Module mode, FindGSL.cmake, method of finding GSL.

Description of changes

  • Change the order in which we call various GSL-discovery modes.
    1. Try CMake's CONFIG mode (looks for gsl-config.cmake in CMAKE_PREFIX_PATH).
    2. Try to find gsl-config.sh (Linux's package-config mode) and use this script to identify GSL_ROOT_DIR before calling (3).
    3. Try CMake's FindGSL.cmake (MODULE mode).

Status

+ Newer GSL installs on Windows provide `gsl-config.cmake` that should be
  used to create the GSL import targets instead of attempting to use the
  CMake Module mode, `FindGSL.cmake`, method of finding GSL.
+ Change the order in which we call various GSL-discovery modes.
  1. Try CMake's `CONFIG` mode (looks for `gsl-config.cmake` in `
     CMAKE_PREFIX_PATH`).
  2. Try to find `gsl-config.sh` (Linux's package-config mode) and use
     this script to identify `GSL_ROOT_DIR` before calling (3).
  3. Try CMake's `FindGSL.cmake` (`MODULE` mode).
@codecov
Copy link

codecov bot commented Sep 25, 2018

Codecov Report

Merging #483 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           develop    #483   +/-   ##
=======================================
  Coverage     91.9%   91.9%           
=======================================
  Files          375     375           
  Lines        17483   17483           
=======================================
  Hits         16072   16072           
  Misses        1411    1411

@KineticTheory
Copy link
Collaborator Author

@RyanWollaeger All tests pass. This can be merged.

Copy link
Contributor

@RyanWollaeger RyanWollaeger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@RyanWollaeger RyanWollaeger merged commit 38b6c2a into lanl:develop Sep 25, 2018
@KineticTheory KineticTheory deleted the fix_gsl_discovery branch September 25, 2018 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants