Skip to content

Commit

Permalink
Revert "Fix configure warning in Trilinos" (#604)
Browse files Browse the repository at this point in the history
* Revert "Fix configure warning in Trilinos (#600)"

This reverts commit 6107d8f.

* Committing clang-format changes

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
gsjaardema and github-actions[bot] authored Mar 5, 2025
1 parent 9ca9e40 commit 2a1d941
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION ${TRIBITS_CMAKE_MINIMUM_REQUIRED} FATAL_ERROR)
# not in an include file :-(
PROJECT(${PROJECT_NAME} NONE)

# This can be removed after the minimum CMake is set to >= 3.27
cmake_policy(SET CMP0144 NEW)
if (${CMAKE_VERSION} GREATER_EQUAL "3.12")
cmake_policy(SET CMP0074 NEW)
endif()

#
# B) Pull in the TriBITS system and execute
Expand Down
3 changes: 3 additions & 0 deletions cmake/TPLs/FindTPLMatio.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
#
# ************************************************************************
# @HEADER
if (${CMAKE_VERSION} GREATER "3.13")
cmake_policy(SET CMP0074 NEW)
endif()

find_package(Matio REQUIRED)
TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( Matio
Expand Down
6 changes: 4 additions & 2 deletions packages/seacas/libraries/aprepro_lib/strings.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ std::vector<std::string> build_strings()
strings.emplace_back(R"({cd = tand(180/4)} {180-4*atand(cd)} $ tan(180/4))");
strings.emplace_back(R"()");
strings.emplace_back(R"(Test max, min, sign, dim, abs)");
strings.emplace_back(R"({pmin = min(0.5, 1.0)} {nmin = min(-0.5, -1.0)} $ Should be 0.5, -1)");
strings.emplace_back(R"({pmax = max(0.5, 1.0)} {nmax = max(-0.5, -1.0)} $ Should be 1.0, -0.5)");
strings.emplace_back(
R"({pmin = min(0.5, 1.0)} {nmin = min(-0.5, -1.0)} $ Should be 0.5, -1)");
strings.emplace_back(
R"({pmax = max(0.5, 1.0)} {nmax = max(-0.5, -1.0)} $ Should be 1.0, -0.5)");
strings.emplace_back(R"({zero = 0} {sign(0.5, zero) + sign(0.5, -zero)} $ Should be 0 1)");
strings.emplace_back(
R"({nonzero = 1} {sign(0.5, nonzero) + sign(0.5, -nonzero)} $ Should be 1 0)");
Expand Down

0 comments on commit 2a1d941

Please sign in to comment.