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.

Sign up for GitHub

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

IOSS: Fix setting of exodiff binary in tests #7421

Merged
merged 1 commit into from
May 24, 2020
Merged

IOSS: Fix setting of exodiff binary in tests #7421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions packages/seacas/libraries/ioss/src/main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,8 @@ if (TPL_ENABLE_MPI)
endif()

if (${CMAKE_PROJECT_NAME}_ENABLE_SEACASExodiff)
find_program (SEACAS_EXODIFF_BINARY
NAME exodiff
PATHS
${BINARY_DIR}
../../../../applications/exodiff
)
set(SEACAS_EXODIFF_BINARY "../../../../applications/exodiff/exodiff")
endif()

if (SEACAS_EXODIFF_BINARY)
TRIBITS_ADD_ADVANCED_TEST(exodus32_to_exodus32
Expand Down Expand Up @@ -183,7 +179,6 @@ IF (SEACASIoss_ENABLE_THREADSAFE)
)
ENDIF()
ENDIF()
ENDIF(${CMAKE_PROJECT_NAME}_ENABLE_SEACASExodiff)

IF (TPL_ENABLE_Pamgen OR Trilinos_ENABLE_Pamgen)
# This test makes sure that the adjacency information (what element blocks are adjacent to what other
Expand Down Expand Up @@ -293,7 +288,7 @@ TRIBITS_ADD_ADVANCED_TEST(exodus32_to_unstructured_cgns
)
endif()

if (${CMAKE_PROJECT_NAME}_ENABLE_SEACASExodiff)
if (SEACAS_EXODIFF_BINARY)
TRIBITS_ADD_ADVANCED_TEST(exodus_to_unstructured_cgns_to_exodus
TEST_0 EXEC io_shell ARGS ${DECOMP_ARG} ${CMAKE_CURRENT_SOURCE_DIR}/test/8-block.g 8-block.cgns
NOEXEPREFIX NOEXESUFFIX
Expand Down