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

More backward-compatible changes to Trilinos 'develop' for updated TriBITS #10533

Commits on May 13, 2022

  1. ATDM: Strip leading and trailing whitespace from flags for newer CMakes

    I was getting an configure time error from CMake 3.19.1 with spaces before the
    math library in Trilinos_EXTRA_LINK_FLAGS with the
    sems-rhel7-clang-7.0.1-openmp-shared-release-debug build on by COE RHEL7
    machine.
    
    Calling string(STRIP ...) takes care of the problem.
    bartlettroscoe committed May 13, 2022
    Configuration menu
    Copy the full SHA
    b825369 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2022

  1. Sacado: Call target_include_directories() for new TriBITS (TriBITSPub…

    …/TriBITS#299)
    
    New TriBITS using modern CMake targets no longer sets the INCLUDE_DIRECTORIES
    directory property but instead passes along include dirs using
    INTERFACE_INCLUDE_DIRECTORIES target properties (like a good CMake project).
    This was a strange test that does not actually link to the Sacado library but
    yet needs a bunch of Sacado include dirs?
    
    We need to look into this and see how to make this work more cleanly either in
    Sacado or TriBITS because this is unfortunate.
    bartlettroscoe committed May 17, 2022
    Configuration menu
    Copy the full SHA
    f81558f View commit details
    Browse the repository at this point in the history
  2. Zoltan2: Properly pass in list to FAIL_REGULAR_EXPRESSION (TriBITSPub…

    …/TriBITS#464)
    
    Before, this was passing in:
    
       FAIL_REGULAR_EXPRESSION "FAIL;BUMMER"
    
    which just happened to be added as a list to the test property with the old
    TriBITS.  But with the new TriBITS in TriBITSPub/TriBITS#464 which more
    correctly deals with semi-colons and list arguments, this was being set as a
    single property value "FAIL\\;BUMMER" which did not match the output.
    
    Passing in the list with:
    
       FAIL_REGULAR_EXPRESSION FAIL BUMMER
    
    works both with old and new TriBITS and is more logical given how CMake/CTest
    is supposed to be used.  (The old TriBITS documentation was incorrect.)
    bartlettroscoe committed May 17, 2022
    Configuration menu
    Copy the full SHA
    98e4e5e View commit details
    Browse the repository at this point in the history
  3. Zoltan2: Use single value for FAIL_REGULAR_EXPRESSION (TriBITSPub/Tri…

    …BITS#464)
    
    Tt turns out that these tests really did not need to pass a list of values to
    FAIL_REGULAR_EXPRESSION.  Each test was really only looking for a single value
    of 'FAILED' or 'BUMMER'.  And you can argue that the tests are stronger and
    better by taking out the other value that is not supposed to be printed in
    that test case.
    bartlettroscoe committed May 17, 2022
    Configuration menu
    Copy the full SHA
    1bcbefc View commit details
    Browse the repository at this point in the history
  4. Isorropria: Unconditionally disable tests that depend on EpetraExt (t…

    …rilinos#10534)
    
    This test code has not been enabled or built in over 10 years due to a defect
    added in commit:
    
      7aabd5d "Isorropia: Make EpetraExt a required dependency"
      Author: Brent Perschbacher <bmpersc@sandia.gov>
      Date:   Tue Feb 21 13:37:59 2012 -0700 (10 years ago)
    
      M       packages/isorropia/cmake/Dependencies.cmake
    
    But note that HAVE_EPETRA was getting set to true unconditionally due to a
    defect in how it was set as:
    
      SET(HAVE_EPETRAEXT ${PACKAGE_NAME}_ENABLE_EpetraExt)
    
    instead of as dereferencing the variable with:
    
      SET(HAVE_EPETRAEXT ${${PACKAGE_NAME}_ENABLE_EpetraExt})
    
    So the value "Isorropia_ENABLE_EpetraExt" evaluates to true in CMake so
    EpetraExt support was always required, even if EpetraExt support in Isorropia
    was disabled!
    
    So I just fixed this to make it clear that this was **always** on by changing
    this to:
    
      SET(HAVE_EPETRAEXT ON)
    
    This test code was getting switched on again with the new TriBITS that sets
    Isorropia_ENABLE_EpetraExt to TRUE, even for required dependencies (see PR
    bartlettroscoe committed May 17, 2022
    Configuration menu
    Copy the full SHA
    d8965b3 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2022

  1. Configuration menu
    Copy the full SHA
    fda0d6a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cc92952 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8c1028d View commit details
    Browse the repository at this point in the history