Skip to content

Commit cf6e3c9

Browse files
blowekampblowekamp
authored
Merge pull request InsightSoftwareConsortium#5873 from blowekamp/update_minc_fdf1845
ENH: Update MINC to fdf1845
2 parents 9b60aa2 + 3f88e77 commit cf6e3c9

3 files changed

Lines changed: 52 additions & 50 deletions

File tree

‎Modules/ThirdParty/MINC/UpdateFromUpstream.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ readonly name="MINC"
88
readonly ownership="Vladimir S. FONOV <vladimir.fonov@gmail.com>"
99
readonly subtree="Modules/ThirdParty/MINC/src/libminc"
1010
readonly repo="https://github.com/BIC-MNI/libminc.git"
11-
readonly tag="master"
11+
readonly tag="fdf1845"
1212
readonly exact_tree_match=false
1313
readonly paths="
1414
./ChangeLog

‎Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Andrew Janke - a.janke@gmail.com
44
# Vladimir S. FONOV - vladimir.fonov@gmail.com
55

6-
cmake_minimum_required(VERSION 3.10)
6+
cmake_minimum_required(VERSION 3.10...4.2)
77

88
project(LIBMINC)
99

@@ -24,9 +24,7 @@ include(CTest)
2424

2525
enable_testing()
2626

27-
if( POLICY CMP0063 )
28-
cmake_policy(SET CMP0063 NEW)
29-
endif()
27+
include(GNUInstallDirs)
3028

3129
if(MINC_TOOLKIT_BUILD)
3230
set(LIBMINC_EXTERNALLY_CONFIGURED ON)
@@ -58,11 +56,15 @@ if(NOT LIBMINC_EXTERNALLY_CONFIGURED)
5856

5957
option(LIBMINC_USE_ASAN "Build with Address Sanitizer" OFF)
6058

59+
if(DEFINED LIB_SUFFIX)
60+
message(WARNING "LIB_SUFFIX is deprecated, use the standard CMAKE_INSTALL_LIBDIR instead")
61+
endif()
62+
6163
set (LIBMINC_EXPORTED_TARGETS "LIBMINC-targets")
62-
set (LIBMINC_INSTALL_BIN_DIR bin)
63-
set (LIBMINC_INSTALL_LIB_DIR lib${LIB_SUFFIX})
64-
set (LIBMINC_INSTALL_INCLUDE_DIR include)
65-
set (LIBMINC_INSTALL_DATA_DIR share)
64+
set (LIBMINC_INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR})
65+
set (LIBMINC_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
66+
set (LIBMINC_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
67+
set (LIBMINC_INSTALL_DATA_DIR ${CMAKE_INSTALL_DATADIR})
6668

6769
if(LIBMINC_MINC1_SUPPORT)
6870
find_package(NETCDF REQUIRED)
@@ -460,7 +462,7 @@ endif()
460462
#START - ITK
461463
set(VOLUME_IO_LIBRARY ${LIBMINC_EXTERNAL_LIB_PREFIX}minc2)
462464
#STOP - ITK
463-
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
465+
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
464466

465467
add_library(${LIBMINC_LIBRARY} ${LIBRARY_TYPE} ${minc_LIB_SRCS} ${minc_HEADERS} ${volume_io_LIB_SRCS} ${volume_io_HEADERS} )
466468

‎Modules/ThirdParty/MINC/src/libminc/config.h.cmake‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,56 @@
1212
#define MINC_VERSION "@LIBMINC_PACKAGE_VERSION@"
1313
#define MINC_PACKAGE_STRING "@LIBMINC_PACKAGE_STRING@"
1414

15-
#cmakedefine HAVE_MINC1 1
15+
#cmakedefine HAVE_MINC1 1
1616
#cmakedefine HAVE_MINC2 1
1717
#cmakedefine LIBMINC_NIFTI_SUPPORT 1
1818

1919
#ifndef H5Acreate_vers
2020
#define H5Acreate_vers 2
2121
#endif //H5Acreate_vers
2222

23-
#cmakedefine HAVE_MKSTEMP 1
24-
#cmakedefine HAVE_STRERROR 1
23+
#cmakedefine HAVE_MKSTEMP 1
24+
#cmakedefine HAVE_STRERROR 1
2525

26-
#cmakedefine HAVE_COPYSIGN 1
27-
#cmakedefine HAVE_ROUND 1
26+
#cmakedefine HAVE_COPYSIGN 1
27+
#cmakedefine HAVE_ROUND 1
2828

29-
#cmakedefine HAVE_DIRENT_H 1
30-
#cmakedefine HAVE_DLFCN_H 1
31-
#cmakedefine HAVE_FCNTL_H 1
32-
#cmakedefine HAVE_FORK 1
33-
#cmakedefine HAVE_GETPWNAM 1
34-
#cmakedefine HAVE_INT16_T 1
35-
#cmakedefine HAVE_INT32_T 1
36-
#cmakedefine HAVE_INTTYPES_H 1
37-
#cmakedefine HAVE_MKSTEMP 1
38-
#cmakedefine HAVE_NDIR_H 1
39-
#cmakedefine HAVE_POPEN 1
40-
#cmakedefine HAVE_PWD_H 1
41-
#cmakedefine HAVE_SELECT 1
42-
#cmakedefine HAVE_STDINT_H 1
43-
#cmakedefine HAVE_STRDUP 1
44-
#cmakedefine HAVE_SYSCONF 1
45-
#cmakedefine HAVE_SYSTEM 1
46-
#cmakedefine HAVE_SYS_DIR_H 1
47-
#cmakedefine HAVE_SYS_NDIR_H 1
48-
#cmakedefine HAVE_SYS_STAT_H 1
49-
#cmakedefine HAVE_SYS_TIME_H 1
50-
#cmakedefine HAVE_SYS_TYPES_H 1
51-
#cmakedefine HAVE_SYS_WAIT_H 1
29+
#cmakedefine HAVE_DIRENT_H 1
30+
#cmakedefine HAVE_DLFCN_H 1
31+
#cmakedefine HAVE_FCNTL_H 1
32+
#cmakedefine HAVE_FORK 1
33+
#cmakedefine HAVE_GETPWNAM 1
34+
#cmakedefine HAVE_INT16_T 1
35+
#cmakedefine HAVE_INT32_T 1
36+
#cmakedefine HAVE_INTTYPES_H 1
37+
#cmakedefine HAVE_MKSTEMP 1
38+
#cmakedefine HAVE_NDIR_H 1
39+
#cmakedefine HAVE_POPEN 1
40+
#cmakedefine HAVE_PWD_H 1
41+
#cmakedefine HAVE_SELECT 1
42+
#cmakedefine HAVE_STDINT_H 1
43+
#cmakedefine HAVE_STRDUP 1
44+
#cmakedefine HAVE_SYSCONF 1
45+
#cmakedefine HAVE_SYSTEM 1
46+
#cmakedefine HAVE_SYS_DIR_H 1
47+
#cmakedefine HAVE_SYS_NDIR_H 1
48+
#cmakedefine HAVE_SYS_STAT_H 1
49+
#cmakedefine HAVE_SYS_TIME_H 1
50+
#cmakedefine HAVE_SYS_TYPES_H 1
51+
#cmakedefine HAVE_SYS_WAIT_H 1
5252
#cmakedefine HAVE_SYS_SELECT_H 1
53-
#cmakedefine HAVE_TEMPNAM 1
54-
#cmakedefine HAVE_TMPNAM 1
55-
#cmakedefine HAVE_UNISTD_H 1
56-
#cmakedefine HAVE_VFORK 1
57-
#cmakedefine HAVE_VFORK_H 1
58-
#cmakedefine HAVE_WORKING_FORK 1
59-
#cmakedefine HAVE_WORKING_VFORK 1
60-
#cmakedefine HAVE_ZLIB 1
61-
#cmakedefine HAVE_STRINGS_H 1
62-
#cmakedefine HAVE_SRAND48 1
63-
#cmakedefine HAVE_DRAND48 1
64-
#cmakedefine HAVE_SLEEP 1
53+
#cmakedefine HAVE_TEMPNAM 1
54+
#cmakedefine HAVE_TMPNAM 1
55+
#cmakedefine HAVE_UNISTD_H 1
56+
#cmakedefine HAVE_VFORK 1
57+
#cmakedefine HAVE_VFORK_H 1
58+
#cmakedefine HAVE_WORKING_FORK 1
59+
#cmakedefine HAVE_WORKING_VFORK 1
60+
#cmakedefine HAVE_ZLIB 1
61+
#cmakedefine HAVE_STRINGS_H 1
62+
#cmakedefine HAVE_SRAND48 1
63+
#cmakedefine HAVE_DRAND48 1
64+
#cmakedefine HAVE_SLEEP 1
6565
#cmakedefine HAVE_CLOCK_GETTIME 1
6666
#cmakedefine HAVE_GETTIMEOFDAY 1
6767
#cmakedefine HAVE_RINT 1

0 commit comments

Comments
 (0)