From 09c92eebacbf0a061cdc1824abff209a2d4a0bf8 Mon Sep 17 00:00:00 2001 From: Jeremy Wright Date: Sun, 22 Dec 2024 20:25:29 -0500 Subject: [PATCH] Implement suggestion to accomodate different version numbers --- .github/workflows/build-ocp.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-ocp.yml b/.github/workflows/build-ocp.yml index bba33f1..3d05bdb 100644 --- a/.github/workflows/build-ocp.yml +++ b/.github/workflows/build-ocp.yml @@ -725,8 +725,8 @@ jobs: rm ${PKG_NAME}*.whl if [[ "${{ matrix.use-vtk }}" == "ON" ]]; then - patchelf --add-rpath '$ORIGIN/../vtk.libs' ${PKG_NAME}-${{ env.OCCT }}/OCP/OCP.*.so - patchelf --add-rpath '$ORIGIN/../vtkmodules' ${PKG_NAME}-${{ env.OCCT }}/OCP/OCP.*.so + patchelf --add-rpath '$ORIGIN/../vtk.libs' ${PKG_NAME}-${{ env.OCCT }}*/OCP/OCP.*.so + patchelf --add-rpath '$ORIGIN/../vtkmodules' ${PKG_NAME}-${{ env.OCCT }}*/OCP/OCP.*.so patchelf --add-rpath '$ORIGIN/../vtkmodules' ${PKG_NAME}-${{ env.OCCT }}/${PKG_NAME}.libs/* fi @@ -749,10 +749,10 @@ jobs: cd pypi/dist python -m wheel unpack ${PKG_NAME}*.whl rm ${PKG_NAME}*.whl - install_name_tool -delete_rpath $(realpath ~/opt/local/occt-${{ env.OCCT }}/lib) ${PKG_NAME}-${{ env.OCCT }}/OCP/OCP.*.so + install_name_tool -delete_rpath $(realpath ~/opt/local/occt-${{ env.OCCT }}/lib) ${PKG_NAME}-${{ env.OCCT }}*/OCP/OCP.*.so if [[ "${{ matrix.use-vtk }}" == "ON" ]]; then - install_name_tool -add_rpath @loader_path/../vtkmodules/.dylibs/ ${PKG_NAME}-${{ env.OCCT }}/OCP/OCP.*.so + install_name_tool -add_rpath @loader_path/../vtkmodules/.dylibs/ ${PKG_NAME}-${{ env.OCCT }}*/OCP/OCP.*.so fi python -m wheel pack ${PKG_NAME}*