[5.4] COMP: Fix extension packaging on macOS accounting for synthetic firmlink #7182
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 858c195) Since the output of "otool -L" reports paths with synthetic firmlinks resolved (see GetPrerequisitesWithRPath), we are using the REAL_PATH file command to also resolve Slicer_SUPERBUILD_DIR and ensure that the test in "SlicerExtensionCPackBundleFixup.cmake.in" checking if "${key}_ITEM" is a library built in Slicer itself work as expected. To illustrate, copied below is the content of the ImageMaker extension package before/after implementing the fix. $ pwd /D/P/S-0-E-b/ImageMaker-build/_CPack_Packages/Darwin/TGZ/32140-macosx-amd64-ImageMaker-git6293f99-2017-07-03/Slicer.app/Contents Before: $ find . . ./Extensions-32140 ./Extensions-32140/ImageMaker ./Extensions-32140/ImageMaker/lib ./Extensions-32140/ImageMaker/lib/Slicer-5.5 ./Extensions-32140/ImageMaker/lib/Slicer-5.5/cli-modules ./Extensions-32140/ImageMaker/lib/Slicer-5.5/cli-modules/ImageMaker ./Extensions-32140/ImageMaker/lib/Slicer-5.5/cli-modules/libImageMakerLib.dylib ./Extensions-32140/ImageMaker/lib/Slicer-5.5/cli-modules/ImageMaker.xml ./Extensions-32140/ImageMaker/share ./Extensions-32140/ImageMaker/share/Slicer-5.5 ./Extensions-32140/ImageMaker/share/Slicer-5.5/ImageMaker.s4ext ./lib ./lib/Slicer-5.5 ./lib/Slicer-5.5/libitkopenjpeg-5.3.1.dylib ./lib/Slicer-5.5/libvtkfreetype-9.2.1.dylib ./lib/Slicer-5.5/libITKznz-5.3.1.dylib ./lib/Slicer-5.5/libITKIOJPEG-5.3.1.dylib [...] ./lib/Slicer-5.5/libvtkglew-9.2.1.dylib ./lib/Slicer-5.5/libITKDeformableMesh-5.3.1.dylib ./lib/Slicer-5.5/libITKTransformFactory-5.3.1.dylib ./lib/Slicer-5.5/libvtkFiltersHybrid-9.2.1.dylib ./lib/Slicer-5.5/libitkhdf5_cpp-shared-5.3.1.dylib After: $ find . . ./Extensions-32140 ./Extensions-32140/ImageMaker ./Extensions-32140/ImageMaker/lib ./Extensions-32140/ImageMaker/lib/Slicer-5.5 ./Extensions-32140/ImageMaker/lib/Slicer-5.5/cli-modules ./Extensions-32140/ImageMaker/lib/Slicer-5.5/cli-modules/ImageMaker ./Extensions-32140/ImageMaker/lib/Slicer-5.5/cli-modules/libImageMakerLib.dylib ./Extensions-32140/ImageMaker/lib/Slicer-5.5/cli-modules/ImageMaker.xml ./Extensions-32140/ImageMaker/share ./Extensions-32140/ImageMaker/share/Slicer-5.5 ./Extensions-32140/ImageMaker/share/Slicer-5.5/ImageMaker.s4ext
jcfr
deleted the
backports/5.4/fix-packaging-of-extension-on-macos-accounting-for-synthetic-firmlinks
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of 858c195 originally introduced through: