Skip to content

COMP: Replace hdf5.h includes with itk_hdf5.h in MINC library #5978

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.

Sign up for GitHub

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

Merged
blowekamp merged 1 commit into from
Mar 25, 2026
+14 −22
Merged

COMP: Replace hdf5.h includes with itk_hdf5.h in MINC library #5978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions Modules/ThirdParty/MINC/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
set(ZLIB_FOUND ON)
set(HDF5_FOUND ON)

if(NOT ITK_USE_SYSTEM_HDF5)
set(HDF5_INCLUDE_DIRS ${ITKHDF5_SOURCE_DIR}/src/itkhdf5)
include_directories(
"${ITKHDF5_SOURCE_DIR}/src/itkhdf5"
"${ITKHDF5_SOURCE_DIR}/src/itkhdf5/src"
"${ITKHDF5_BINARY_DIR}/src/itkhdf5"
)
endif()
set(HDF5_LIBRARIES ${ITKHDF5_LIBRARIES})
set(HDF5_LIBRARIES ITK::ITKHDF5Module)

set(BUILD_TESTING OFF)
add_subdirectory(libminc)
Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libcommon/ParseArgv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#endif

#ifdef HAVE_MINC2
#include <hdf5.h>
#include <itk_hdf5.h>
#endif

#include <math.h>
Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc/minc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
#endif /* MNCAPI not defined */

#if MINC2
#include <hdf5.h>
#include <itk_hdf5.h>
#include <netcdf.h>
#include "minc_compat.h"
#else
Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* \defgroup mi2Cvt MINC 2.0 Coordinate and Voxel Conversion Functions
*/
#include <stdlib.h>
#include <hdf5.h>
#include <itk_hdf5.h>
#include <math.h>
#include <float.h>
#include "minc2.h"
Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/datatype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
************************************************************************/

#include <stdlib.h>
#include <hdf5.h>
#include <itk_hdf5.h>
#include "minc2.h"
#include "minc2_private.h"

Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/grpattr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Functions to manipulate attributes and groups.
************************************************************************/
#include <stdlib.h>
#include <hdf5.h>
#include <itk_hdf5.h>

#ifdef HAVE_CONFIG_H
#include "config.h"
Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/label.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
************************************************************************/

#include <stdlib.h>
#include <hdf5.h>
#include <itk_hdf5.h>
#include "minc2.h"
#include "minc2_private.h"

Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/m2util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* \author Leila Baghdadi, Bert Vincent
*
************************************************************************/
#include <hdf5.h>
#include <itk_hdf5.h>

#include <stdlib.h>
#include <math.h>
Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/minc2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef MINC2_H
#define MINC2_H

#include <hdf5.h>
#include <itk_hdf5.h>
#include "minc2_defs.h"
#include "minc2_structs.h"
#include "minc2_error.h"
Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/record.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "config.h"
#endif /*HAVE_CONFIG_H*/

#include <hdf5.h>
#include <itk_hdf5.h>
#include "minc2.h"
#include "minc2_private.h"

Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/slice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#endif /*HAVE_CONFIG_H*/

#include <stdlib.h>
#include <hdf5.h>
#include <itk_hdf5.h>
#include "minc2.h"
#include "minc2_private.h"

Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/valid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#endif /*HAVE_CONFIG_H*/

#include <stdlib.h>
#include <hdf5.h>
#include <itk_hdf5.h>
#include "minc2.h"
#include "minc2_private.h"

Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/volprops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#define _GNU_SOURCE 1
#include <stdlib.h>
#include <hdf5.h>
#include <itk_hdf5.h>
#include "minc2.h"
#include "minc2_private.h"
#include "minc_config.h"
Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/src/libminc/libsrc2/volume.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Functions to create, open, and close MINC volume objects.
************************************************************************/
#include <stdlib.h>
#include <hdf5.h>
#include <itk_hdf5.h>

#ifdef HAVE_CONFIG_H
#include "config.h"
Expand Down
Loading