diff --git a/.github/actions/f3d-superbuild/action.yml b/.github/actions/f3d-superbuild/action.yml index 6ab0630b..2e3f6954 100644 --- a/.github/actions/f3d-superbuild/action.yml +++ b/.github/actions/f3d-superbuild/action.yml @@ -76,7 +76,7 @@ runs: shell: bash run: | curl -L --output vtk_commit_sha https://raw.githubusercontent.com/f3d-app/f3d/master/.github/actions/vtk_commit_sha - echo VTK_COMMIT_SHA=`cat ./vtk_commit_sha` >> $GITHUB_ENV + echo VTK_COMMIT_SHA=48677f5358519ca59d6269613e0c57e75da77020 >> $GITHUB_ENV # OCCT coloring is disabled on macOS because of f3d-app/f3d#792 - name: Configure diff --git a/.github/actions/wheels/action.yml b/.github/actions/wheels/action.yml index f404aeb1..1412c0e6 100644 --- a/.github/actions/wheels/action.yml +++ b/.github/actions/wheels/action.yml @@ -41,7 +41,7 @@ runs: uses: actions/cache@v4 with: path: fsbb/install - key: fsbb-${{runner.os}}-${{env.VTK_COMMIT_SHA}}-0 + key: fsbb-${{runner.os}}-${{env.VTK_COMMIT_SHA}}-1 - name: Setup Ninja Windows if: runner.os == 'Windows' diff --git a/projects/f3d.cmake b/projects/f3d.cmake index bfa54000..c9493602 100644 --- a/projects/f3d.cmake +++ b/projects/f3d.cmake @@ -26,7 +26,7 @@ superbuild_add_project(f3d -Werror=deprecated --warn-uninitialized -DCMAKE_INSTALL_NAME_DIR:PATH=/lib - -DF3D_LINUX_GENERATE_MAN:BOOL=${f3d_build_for_linux} + -DF3D_LINUX_GENERATE_MAN:BOOL=OFF -DF3D_LINUX_INSTALL_DEFAULT_CONFIGURATION_FILE_IN_PREFIX:BOOL=${f3d_build_for_linux} -DF3D_MACOS_BUNDLE:BOOL=${f3d_build_for_macos} -DF3D_MODULE_EXR:BOOL=${openexr_enabled} diff --git a/projects/unix/f3d.bundle.cmake b/projects/unix/f3d.bundle.cmake index 183c12da..ae3e0cd8 100644 --- a/projects/unix/f3d.bundle.cmake +++ b/projects/unix/f3d.bundle.cmake @@ -68,9 +68,9 @@ foreach (f3d_resource_dir IN LISTS f3d_resource_dirs) endforeach () # Individual files to package -install( - FILES "${superbuild_install_location}/share/man/man1/f3d.1.gz" - DESTINATION "share/man/man1") +#install( +# FILES "${superbuild_install_location}/share/man/man1/f3d.1.gz" +# DESTINATION "share/man/man1") ## Package libf3d SDK diff --git a/superbuild b/superbuild index 8ade4b65..a166a037 160000 --- a/superbuild +++ b/superbuild @@ -1 +1 @@ -Subproject commit 8ade4b6511fe0f5a294676630f02c149d1467064 +Subproject commit a166a03701c0bff98414f74d0c39a9fd0484f2f8