Skip to content

COMP: Update VTK to improve support for extension bundling VTK modules#5714

Merged
jcfr merged 1 commit intoSlicer:masterfrom
jcfr:update-vtk-to-avoid-generating-files-in-source-tree-for-extension-bundling-vtk-module
Jun 29, 2021
Merged

COMP: Update VTK to improve support for extension bundling VTK modules#5714
jcfr merged 1 commit intoSlicer:masterfrom
jcfr:update-vtk-to-avoid-generating-files-in-source-tree-for-extension-bundling-vtk-module

Conversation

@jcfr
Copy link
Member

@jcfr jcfr commented Jun 29, 2021

VTK modules can be built in the following scenarios:

  1. Module sources and generated buildsystem are respectively in VTK source and build trees (aka built-in case)
  2. Module sources are external and module generated buildsystem is in VTK build tree (aka built-in case for a VTK remote module)
  3. Module sources and module generated buildsystem are both external
  4. Module sources are in VTK source tree and module generated buildsystem is external

This commit updates VTK to include logic ensuring files are not generated
in VTK source for case (3) and (4).

List of changes:

$ git shortlog f3c1a72fbf..fe57670c3e --no-merges
Jean-Christophe Fillion-Robin (1):
      [Backport MR-8123] Do not generate files in source tree when building module externally

VTK modules can be built in the following scenarios:

1. Module sources and generated buildsystem are respectively in VTK source and build trees (aka built-in case)
2. Module sources are external and module generated buildsystem is in VTK build tree (aka built-in case for a VTK remote module)
3. Module sources and module generated buildsystem are both external
4. Module sources are in VTK source tree and module generated buildsystem is external

This commit updates VTK to include logic ensuring files are not generated
in VTK source for case (3) and (4).

List of changes:

$ git shortlog f3c1a72fbf..fe57670c3e --no-merges
Jean-Christophe Fillion-Robin (1):
      [Backport MR-8123] Do not generate files in source tree when building module externally
@jcfr jcfr merged commit 5270e2f into Slicer:master Jun 29, 2021
@jcfr jcfr deleted the update-vtk-to-avoid-generating-files-in-source-tree-for-extension-bundling-vtk-module branch June 29, 2021 22:22
@jcfr
Copy link
Member Author

jcfr commented Jun 29, 2021

After additional testing, this will likely need an additional tweak.

@jcfr
Copy link
Member Author

jcfr commented Jun 30, 2021

After additional testing, this will likely need an additional tweak.

With a clean build of the extension, there are no issues.

@cpinter
Copy link
Member

cpinter commented Jun 30, 2021

This is great @jcfr , thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants