Merge branch 'master' into exodiff-changeset-modifications

sandialabs · Dec 10, 2024 · fb86276 · fb86276
2 parents cfc595d + 7e120f2
commit fb86276
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
@@ -27,7 +27,7 @@ jobs:
           egress-policy: audit
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: msys2/setup-msys2@c52d1fa9c7492275e60fe763540fb601f5f232a1 # v2.25.0
+      - uses: msys2/setup-msys2@d44ca8e88d8b43d56cf5670f91747359d5537f97 # v2.26.0
         with:
           msystem: MINGW64
           update: true

diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt
@@ -72,7 +72,7 @@ if (SEACASExodus_ENABLE_STATIC)
 
    # For backwards compatibility, the C exodus library was called libexoIIv2c.a
    # Create a symbolic link from libexodus.a to libexoIIv2c.a -- do only for static lib
-   InstallSymLink(libexodus.a ${CMAKE_INSTALL_LIBDIR}/libexoIIv2c.a)
+   InstallSymLink(libexodus.a ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libexoIIv2c.a)
 endif()
 
 if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas")

diff --git a/packages/seacas/libraries/exodus_for/CMakeLists.txt b/packages/seacas/libraries/exodus_for/CMakeLists.txt
@@ -41,7 +41,7 @@ if (SEACASExodus_ENABLE_STATIC)
 
    # For backwards compatibility, the Fortran exodus library was called libexoIIv2for.a
    # Create a symbolic link from libexodus_for.a to libexoIIv2for.a -- do only for static lib
-   InstallSymLink(libexodus_for.a ${CMAKE_INSTALL_LIBDIR}/libexoIIv2for.a)
+   InstallSymLink(libexodus_for.a ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libexoIIv2for.a)
 endif()
 
 TRIBITS_ADD_TEST_DIRECTORIES(test)