Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STYLE: Install MINC's cmake files to lib/cmake #754

Closed
wants to merge 1 commit into from
Closed

STYLE: Install MINC's cmake files to lib/cmake #754

wants to merge 1 commit into from

Conversation

zbeekman
Copy link

PR Checklist

Refer to the ITK Software Guide for
further development details if necessary.

 - Install MINC's cmake files (`itkLIBMINCConfig.cmake` and
   `UseitkLIBMINC.cmake` into `lib/cmake` not `lib/`
 - This patch is required to get ITK accepted into the Homebrew package manager
 - See also Homebrew/homebrew-core#39138
@thewtex
Copy link
Member

thewtex commented Apr 23, 2019

@zbeekman thanks for the contribution and for packaging ITK in Homebrew.

Please consider creating a pull request on the upstream libminc repository. Typically, we merge there first, then do a subtree merge into ITK.

CC: @vfonov @gdevenyi @iMichka

vfonov pushed a commit to BIC-MNI/libminc that referenced this pull request Apr 23, 2019
…eed to propagate to all packages using libminc
@zbeekman
Copy link
Author

I was about to PR upstream, but it looks like @vfonov beat me to working on it, so I'll leave it alone.

@zbeekman
Copy link
Author

@thewtex: It looks like upstream is patching MINC. Should I close this PR under the assumption that it will be included in the next MINC/ITK release? Please let me know how you think we should proceed.

@thewtex
Copy link
Member

thewtex commented Apr 24, 2019

@vfonov can develop-homebrew-style be merged into develop? @zbeekman we will then pull in your changes from libminc and this PR can be closed.

@thewtex thewtex mentioned this pull request Apr 24, 2019
vfonov added a commit to vfonov/ITK that referenced this pull request Apr 24, 2019
Run the UpdateFromUpstream.sh script to extract upstream MINC
using the following shell commands.

$ git archive --prefix=upstream-minc/ 44fae20d -- 
./ChangeLog
./volume_io
./libsrc
./libsrc/minc_compat.h
./libcommon/minc_config.h
./libcommon/minc_config.c
./libsrc/minc_format_convert.c
./libsrc/value_conversion.c
./libsrc/hdf_convenience.c
./libcommon/read_file_names.c
./libsrc/minc_simple.c
./libcommon/time_stamp.h
./libsrc/hdf_convenience.h
./libsrc/type_limits.h
./libcommon/read_file_names.h
./libsrc/minc_varlists.h
./libcommon/restructure.h
./libsrc/nd_loop.h
./libcommon/restructure.c
./libsrc/minc_simple.h
./libsrc/strdup.c
./libsrc/minc_useful.h
./libsrc/minc_convenience.c
./libsrc/minc_basic.h
./libsrc/minc_compat.c
./libcommon/time_stamp.c
./libsrc/voxel_loop.h
./libsrc/minc_routines.h
./libsrc/minc_private.h
./libsrc/netcdf_convenience.c
./libsrc/voxel_loop.c
./libsrc/dim_conversion.c
./libsrc/minc_format_convert.h
./libsrc/nd_loop.c
./libcommon/ParseArgv.h
./libcommon/minc_error.c
./libcommon/minc_error.h
./libsrc/minc_structures.h
./libsrc/minc.h
./libsrc/image_conversion.c
./libcommon/ParseArgv.c
./libcommon/minc_common_defs.h
./COPYING
./UseLIBMINC.cmake.in
./NEWS
./AUTHORS
./libsrc2/m2util.c
./libsrc2/minc2_defs.h
./libsrc2/minc2_api.h
./libcommon/minc2_error.h
./libsrc2/grpattr.c
./libsrc2/hyper.c
./libsrc2/minc_compat2.h
./libcommon/minc2_error.c
./libsrc2/record.c
./libsrc2/volume.c
./libsrc2/datatype.c
./libsrc2/volprops.c
./libsrc2/valid.c
./libsrc2/convert.c
./libsrc2/free.c
./libsrc2/dimension.c
./libsrc2/label.c
./libsrc2/minc2.h
./libsrc2/minc2_private.h
./libsrc2/slice.c
./libsrc2/minc2_structs.h
./CMakeLists.txt
./nifti
./LIBMINCConfig.cmake.in
./README.release
./INSTALL
./config.h.cmake
./README
 | tar x
$ git shortlog --perl-regexp --author='^((?!Kitware Robot).*)$' --no-merges --abbrev=8 --format='%h %s' ce4333ca..44fae20d

Vladimir S. FONOV (10):
      fd83832f Adopted code from ITK: http://review.source.kitware.com/#/c/23646/ , addresses InsightSoftwareConsortium#99
      e78160de Updated list of dependecies in libminc project
      b2bba385 Fixing build with ubuntu HDF5 package
      361f2b53 Fixing build with ubuntu HDF5 package
      9abbd9a0 Fixed a resource leak when dealing with gzipped minc file in minc1_io
      e6b27467 Changed configuration files for better integration into conda
      9cd436de Fixing configuration files
      c2494d2d Fixed mixup in configuration parameters
      bcbccf97 Fixed missing quite
      44fae20d Trying to implement changes from InsightSoftwareConsortium#754, need to propagate to all packages using libminc

Change-Id: I83f8dce41072978366cf89bd05d177b4dd62d5ee
@vfonov vfonov mentioned this pull request Apr 24, 2019
8 tasks
@zbeekman
Copy link
Author

LMK if you're minting a new release of ITK anytime soon. I'm going ahead and green-lighting the Homebrew PR but, so long as the MINC patch makes it into the next release, we'll need to remove the patch we're currently applying in Homebrew.

@zbeekman
Copy link
Author

xref: Homebrew/homebrew-core#39138

@thewtex
Copy link
Member

thewtex commented Apr 25, 2019

Thanks, @zbeekman .

This has been merged into ITK master, and it will be in ITK 5.0 RC 2 (to be released within the week).

@thewtex thewtex closed this Apr 25, 2019
@zbeekman
Copy link
Author

zbeekman commented Apr 25, 2019 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants