diff --git a/.github/workflows/build_external_lib.yml b/.github/workflows/build_external_lib.yml index 1502dcac86..27c3cb78bf 100644 --- a/.github/workflows/build_external_lib.yml +++ b/.github/workflows/build_external_lib.yml @@ -32,7 +32,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Install System dependencies shell: bash -l {0} diff --git a/.github/workflows/build_netcdf_no_hdf5.yml b/.github/workflows/build_netcdf_no_hdf5.yml index 01ff707e41..b7f4086766 100644 --- a/.github/workflows/build_netcdf_no_hdf5.yml +++ b/.github/workflows/build_netcdf_no_hdf5.yml @@ -34,7 +34,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Install System dependencies shell: bash -l {0} @@ -97,7 +97,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Install System dependencies shell: bash -l {0} diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 087a7aa179..dacf2b69e9 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -34,7 +34,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Install System dependencies shell: bash -l {0} @@ -80,7 +80,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Install System dependencies shell: bash -l {0} diff --git a/.github/workflows/build_variant.yml b/.github/workflows/build_variant.yml index 90dca86b1a..c281d01b68 100644 --- a/.github/workflows/build_variant.yml +++ b/.github/workflows/build_variant.yml @@ -35,7 +35,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Install System dependencies shell: bash -l {0} @@ -385,7 +385,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Install System dependencies shell: bash -l {0} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e896a36b49..0dca22a839 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -46,7 +46,7 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index abd583d87a..5bc787b295 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Install System dependencies shell: bash -l {0} @@ -71,7 +71,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Install System dependencies shell: bash -l {0} diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index c1209291aa..5c03af260a 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -22,6 +22,6 @@ jobs: egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: 'Dependency Review' uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4 diff --git a/.github/workflows/docker-exodus.yml b/.github/workflows/docker-exodus.yml index 8b985041c1..c2feb9c535 100644 --- a/.github/workflows/docker-exodus.yml +++ b/.github/workflows/docker-exodus.yml @@ -19,7 +19,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Docker login uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: diff --git a/.github/workflows/docker-seacas.yml b/.github/workflows/docker-seacas.yml index 6c1dee0e1c..2e70dcb9cd 100644 --- a/.github/workflows/docker-seacas.yml +++ b/.github/workflows/docker-seacas.yml @@ -19,7 +19,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Docker login uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 with: diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index cd08a774d5..61703fc7ff 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -43,7 +43,7 @@ jobs: remove-android: 'true' remove-haskell: 'true' remove-codeql: 'true' - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: setup repo run: | wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB @@ -110,7 +110,7 @@ jobs: remove-android: 'true' remove-haskell: 'true' remove-codeql: 'true' - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: setup repo run: | wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index c3b58e3fc7..0b6bc1d382 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -26,7 +26,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - uses: msys2/setup-msys2@ddf331adaebd714795f1042345e6ca57bd66cea8 # v2.24.1 with: msystem: MINGW64 diff --git a/.github/workflows/python-linting.yml b/.github/workflows/python-linting.yml index 60df53a022..50041858e3 100644 --- a/.github/workflows/python-linting.yml +++ b/.github/workflows/python-linting.yml @@ -19,7 +19,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Set up Python uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0 with: diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 59efdcb1d9..6098639c21 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -36,7 +36,7 @@ jobs: egress-policy: audit - name: "Checkout code" - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: persist-credentials: false diff --git a/.github/workflows/trailing.yml b/.github/workflows/trailing.yml index 7db5ed381d..a5d839bbe3 100644 --- a/.github/workflows/trailing.yml +++ b/.github/workflows/trailing.yml @@ -12,5 +12,5 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - uses: harupy/find-trailing-whitespace@56310d70ae8fd21afec8d4307d2d9ab6c15e7c5d # master diff --git a/packages/seacas/applications/cpup/cpup.C b/packages/seacas/applications/cpup/cpup.C index 0d74df723e..8939076414 100644 --- a/packages/seacas/applications/cpup/cpup.C +++ b/packages/seacas/applications/cpup/cpup.C @@ -700,19 +700,25 @@ namespace { fmt::print(stderr, " {:14} cells, {:14} nodes ", fmt::group_digits(num_cell), fmt::group_digits(num_node)); +#if defined(__NVCC__) +#define CONST +#else +#define CONST const +#endif if (!sb->m_zoneConnectivity.empty()) { fmt::print(stderr, "\n\tConnectivity with other blocks:\n"); - for (const auto &zgc : sb->m_zoneConnectivity) { + for (CONST auto &zgc : sb->m_zoneConnectivity) { fmt::print(stderr, "{}\n", zgc); } } if (!sb->m_boundaryConditions.empty()) { fmt::print(stderr, "\tBoundary Conditions:\n"); - for (const auto &bc : sb->m_boundaryConditions) { + for (CONST auto &bc : sb->m_boundaryConditions) { fmt::print(stderr, "{}\n", bc); } } +#undef CONST } } diff --git a/packages/seacas/libraries/exodus/include/exodusII_int.h b/packages/seacas/libraries/exodus/include/exodusII_int.h index 138e0af85e..e1fbb34325 100644 --- a/packages/seacas/libraries/exodus/include/exodusII_int.h +++ b/packages/seacas/libraries/exodus/include/exodusII_int.h @@ -26,7 +26,7 @@ #include "netcdf_meta.h" #endif -#if NC_HAS_ZSTD == 1 +#if NC_HAS_ZSTD == 1 || NC_HAS_BZ2 #include "netcdf_filter.h" #endif diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.C b/packages/seacas/libraries/ioss/src/Ioss_Utils.C index abfe50f8a5..3e23ae9f25 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.C +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.C @@ -1371,10 +1371,15 @@ void Ioss::Utils::info_fields(const Ioss::GroupingEntity *ige, Ioss::Field::Role if (!header.empty()) { cur_out = header.size() + suffix.size() + 16; // Assume 2 tabs... } + for (const auto &field_name : fields) { if (detail) { const auto &field_ref = ige->get_fieldref(field_name); +#if defined(__NVCC__) + std::cout << field_ref << suffix; +#else fmt::print("{}{}", field_ref, suffix); +#endif } else { const Ioss::VariableType *var_type = ige->get_field(field_name).raw_storage(); diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C index a6f9c2e987..44c932eb98 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C @@ -4869,7 +4869,7 @@ namespace Ioex { std::vector proc_id(elementCount, myProcessor); const auto &blocks = region->get_element_blocks(); for (const auto &block : blocks) { - put_field_internal(block, block->get_field("proc_id"), Data(proc_id), -1); + put_field_internal(block, block->get_field("proc_id"), Data(proc_id), 0); } } diff --git a/packages/seacas/scripts/CMakeLists.txt b/packages/seacas/scripts/CMakeLists.txt index 294d0ae9c7..aa3b58c57c 100644 --- a/packages/seacas/scripts/CMakeLists.txt +++ b/packages/seacas/scripts/CMakeLists.txt @@ -4,6 +4,7 @@ endif() SET( ACCESSDIR ${CMAKE_INSTALL_PREFIX} ) SET( SEPARATOR "_") +INCLUDE(GNUInstallDirs) ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASNemspread) ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASNemslice) @@ -23,7 +24,7 @@ IF (${PROJECT_NAME}_ENABLE_SEACASNemspread AND ${PROJECT_NAME}_ENABLE_SEACASNems DESTINATION ${CMAKE_CURRENT_BINARY_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/decomp DESTINATION bin) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/decomp DESTINATION ${CMAKE_INSTALL_BINDIR}) ENDIF() ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASBlot) @@ -33,7 +34,7 @@ IF (${PROJECT_NAME}_ENABLE_SEACASBlot) ${CMAKE_CURRENT_BINARY_DIR}/blot @ONLY ) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/blot DESTINATION bin) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/blot DESTINATION ${CMAKE_INSTALL_BINDIR}) ENDIF() ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASFastq) @@ -43,7 +44,7 @@ IF (${PROJECT_NAME}_ENABLE_SEACASFastq) ${CMAKE_CURRENT_BINARY_DIR}/fastq @ONLY ) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fastq DESTINATION bin) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fastq DESTINATION ${CMAKE_INSTALL_BINDIR}) ENDIF() ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASEpu) @@ -53,7 +54,7 @@ IF (${PROJECT_NAME}_ENABLE_SEACASEpu) ${CMAKE_CURRENT_BINARY_DIR}/epup @ONLY ) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/epup DESTINATION bin) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/epup DESTINATION ${CMAKE_INSTALL_BINDIR}) ENDIF() ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASConjoin) @@ -63,7 +64,7 @@ IF (${PROJECT_NAME}_ENABLE_SEACASConjoin) ${CMAKE_CURRENT_BINARY_DIR}/pconjoin @ONLY ) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pconjoin DESTINATION bin) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pconjoin DESTINATION ${CMAKE_INSTALL_BINDIR}) ENDIF() TRIBITS_INCLUDE_DIRECTORIES( @@ -88,7 +89,7 @@ ENDIF() ASSERT_DEFINED(${PROJECT_NAME}_ENABLE_SEACASExodus) ASSERT_DEFINED(BUILD_SHARED_LIBS) IF (${PROJECT_NAME}_ENABLE_SEACASExodus) - find_package(Python COMPONENTS Interpreter) + find_package(Python COMPONENTS Interpreter Development) IF (${Python_FOUND}) message(STATUS "Found python version ${Python_VERSION}") IF (${Python_VERSION} VERSION_LESS "3.0") @@ -99,86 +100,66 @@ IF (${PROJECT_NAME}_ENABLE_SEACASExodus) SET( EXODUSPY "exodus3.py" ) SET( EXOMERGE "exomerge3.py") IF (NOT ${PROJECT_NAME}_HOSTNAME STREQUAL "APPVEYOR-VM") - ADD_TEST(NAME test_exodus3.py COMMAND ${CMAKE_INSTALL_PREFIX}/lib/tests/test_exodus3.py) - ADD_TEST(NAME test_exomerge3.py COMMAND ${CMAKE_INSTALL_PREFIX}/lib/tests/exomerge_unit_test.py) + ADD_TEST(NAME test_exodus3.py COMMAND ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/tests/test_exodus3.py) + ADD_TEST(NAME test_exomerge3.py COMMAND ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/tests/exomerge_unit_test.py) ENDIF() MESSAGE(STATUS "A Python-3 version of exodus.py and exomerge.py will be installed.") ENDIF() IF (BUILD_SHARED_LIBS OR SEACASExodus_ENABLE_SHARED) - IF (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "") - IF( ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} MATCHES "^${CMAKE_INSTALL_PREFIX}.*" ) - STRING( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "" - SEACAS_INCLUDEDIR "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}" ) - STRING( REGEX REPLACE "^/" "" SEACAS_INCLUDEDIR "${SEACAS_INCLUDEDIR}" ) - ELSEIF( NOT ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR} MATCHES "^/" ) - SET( SEACAS_INCLUDEDIR "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}" ) - ELSE() - SET( SEACAS_INCLUDEDIR "include" ) - ENDIF() - IF( ${${PROJECT_NAME}_INSTALL_LIB_DIR} MATCHES "^${CMAKE_INSTALL_PREFIX}.*" ) - STRING( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "" - SEACAS_LIBDIR "${${PROJECT_NAME}_INSTALL_LIB_DIR}" ) - STRING( REGEX REPLACE "^/" "" SEACAS_LIBDIR "${SEACAS_LIBDIR}") - ELSEIF( NOT ${CMAKE_INSTALL_LIBDIR} MATCHES "^/" ) - SET( SEACAS_LIBDIR "${${PROJECT_NAME}_INSTALL_LIB_DIR}" ) - ELSE() - SET( SEACAS_LIBDIR "lib" ) - ENDIF() - ENDIF() - FILE(GLOB_RECURSE EXODUSIIH "${CMAKE_SOURCE_DIR}/packages/seacas/*exodusII.h") - FILE(STRINGS "${EXODUSIIH}" EXODUS_VERSION REGEX "#define EXODUS_VERSION .*") - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/exodus2.in.py - ${CMAKE_CURRENT_BINARY_DIR}/exodus2.py - @ONLY - ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/exodus3.in.py - ${CMAKE_CURRENT_BINARY_DIR}/exodus3.py - @ONLY - ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/tests/exomerge_unit_test.py - ${CMAKE_CURRENT_BINARY_DIR}/tests/exomerge_unit_test.py - @ONLY - ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/exomerge3.py - ${CMAKE_CURRENT_BINARY_DIR}/exomerge3.py - @ONLY - ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/exomerge2.py - ${CMAKE_CURRENT_BINARY_DIR}/exomerge2.py - @ONLY - ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_exodus3.py - ${CMAKE_CURRENT_BINARY_DIR}/tests/test_exodus3.py - @ONLY - ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/tests/test-assembly.exo - ${CMAKE_CURRENT_BINARY_DIR}/tests/test-assembly.exo - COPYONLY - ) + FILE(GLOB_RECURSE EXODUSIIH "${CMAKE_SOURCE_DIR}/packages/seacas/*exodusII.h") + FILE(STRINGS "${EXODUSIIH}" EXODUS_VERSION REGEX "#define EXODUS_VERSION .*") + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/exodus2.in.py + ${CMAKE_CURRENT_BINARY_DIR}/exodus2.py + @ONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/exodus3.in.py + ${CMAKE_CURRENT_BINARY_DIR}/exodus3.py + @ONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/tests/exomerge_unit_test.py + ${CMAKE_CURRENT_BINARY_DIR}/tests/exomerge_unit_test.py + @ONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/exomerge3.py + ${CMAKE_CURRENT_BINARY_DIR}/exomerge3.py + @ONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/exomerge2.py + ${CMAKE_CURRENT_BINARY_DIR}/exomerge2.py + @ONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_exodus3.py + ${CMAKE_CURRENT_BINARY_DIR}/tests/test_exodus3.py + @ONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/tests/test-assembly.exo + ${CMAKE_CURRENT_BINARY_DIR}/tests/test-assembly.exo + COPYONLY + ) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exodus2.py DESTINATION lib) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exodus3.py DESTINATION lib) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tests/test_exodus3.py DESTINATION lib/tests/) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tests/exomerge_unit_test.py DESTINATION lib/tests/) - INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/tests/test-assembly.exo DESTINATION lib/tests/) - INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/tests/exomerge_unit_test.e DESTINATION lib/tests/) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exomerge2.py DESTINATION lib) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exomerge3.py DESTINATION lib) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exodus2.py DESTINATION ${CMAKE_INSTALL_LIBDIR}) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exodus3.py DESTINATION ${CMAKE_INSTALL_LIBDIR}) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tests/test_exodus3.py DESTINATION ${CMAKE_INSTALL_LIBDIR}/tests/) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tests/exomerge_unit_test.py DESTINATION ${CMAKE_INSTALL_LIBDIR}/tests/) + INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/tests/test-assembly.exo DESTINATION ${CMAKE_INSTALL_LIBDIR}/tests/) + INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/tests/exomerge_unit_test.e DESTINATION ${CMAKE_INSTALL_LIBDIR}/tests/) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exomerge2.py DESTINATION ${CMAKE_INSTALL_LIBDIR}) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/exomerge3.py DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas" AND NOT WIN32) - InstallSymLink(${EXODUSPY} ${CMAKE_INSTALL_PREFIX}/lib/exodus.py) - InstallSymLink(${EXOMERGE} ${CMAKE_INSTALL_PREFIX}/lib/exomerge.py) - endif() + if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas" AND NOT WIN32) + InstallSymLink(${EXODUSPY} ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/exodus.py) + InstallSymLink(${EXOMERGE} ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/exomerge.py) + endif() ELSE() - MESSAGE(STATUS "Exodus.py and exomerge.py NOT installed since shared exodus library is not available.") + MESSAGE(STATUS "Exodus.py and exomerge.py NOT installed since shared exodus library is not available.") ENDIF() else() MESSAGE(STATUS "Exodus.py and exomerge.py NOT installed since Python could not be found.")