Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Modules/ThirdParty/MINC/UpdateFromUpstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readonly name="MINC"
readonly ownership="Vladimir S. FONOV <vladimir.fonov@gmail.com>"
readonly subtree="Modules/ThirdParty/MINC/src/libminc"
readonly repo="https://github.com/BIC-MNI/libminc.git"
readonly tag="master"
readonly tag="fdf1845"
readonly exact_tree_match=false
readonly paths="
./ChangeLog
Expand Down
20 changes: 11 additions & 9 deletions Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Andrew Janke - a.janke@gmail.com
# Vladimir S. FONOV - vladimir.fonov@gmail.com

cmake_minimum_required(VERSION 3.10)
cmake_minimum_required(VERSION 3.10...4.2)

project(LIBMINC)

Expand All @@ -24,9 +24,7 @@ include(CTest)

enable_testing()

if( POLICY CMP0063 )
cmake_policy(SET CMP0063 NEW)
endif()
include(GNUInstallDirs)

if(MINC_TOOLKIT_BUILD)
set(LIBMINC_EXTERNALLY_CONFIGURED ON)
Expand Down Expand Up @@ -58,11 +56,15 @@ if(NOT LIBMINC_EXTERNALLY_CONFIGURED)

option(LIBMINC_USE_ASAN "Build with Address Sanitizer" OFF)

if(DEFINED LIB_SUFFIX)
message(WARNING "LIB_SUFFIX is deprecated, use the standard CMAKE_INSTALL_LIBDIR instead")
endif()

set (LIBMINC_EXPORTED_TARGETS "LIBMINC-targets")
set (LIBMINC_INSTALL_BIN_DIR bin)
set (LIBMINC_INSTALL_LIB_DIR lib${LIB_SUFFIX})
set (LIBMINC_INSTALL_INCLUDE_DIR include)
set (LIBMINC_INSTALL_DATA_DIR share)
set (LIBMINC_INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR})
set (LIBMINC_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
set (LIBMINC_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
set (LIBMINC_INSTALL_DATA_DIR ${CMAKE_INSTALL_DATADIR})

if(LIBMINC_MINC1_SUPPORT)
find_package(NETCDF REQUIRED)
Expand Down Expand Up @@ -460,7 +462,7 @@ endif()
#START - ITK
set(VOLUME_IO_LIBRARY ${LIBMINC_EXTERNAL_LIB_PREFIX}minc2)
#STOP - ITK
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})

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

Expand Down
80 changes: 40 additions & 40 deletions Modules/ThirdParty/MINC/src/libminc/config.h.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,56 +12,56 @@
#define MINC_VERSION "@LIBMINC_PACKAGE_VERSION@"
#define MINC_PACKAGE_STRING "@LIBMINC_PACKAGE_STRING@"

#cmakedefine HAVE_MINC1 1
#cmakedefine HAVE_MINC1 1
#cmakedefine HAVE_MINC2 1
#cmakedefine LIBMINC_NIFTI_SUPPORT 1

#ifndef H5Acreate_vers
#define H5Acreate_vers 2
#endif //H5Acreate_vers

#cmakedefine HAVE_MKSTEMP 1
#cmakedefine HAVE_STRERROR 1
#cmakedefine HAVE_MKSTEMP 1
#cmakedefine HAVE_STRERROR 1

#cmakedefine HAVE_COPYSIGN 1
#cmakedefine HAVE_ROUND 1
#cmakedefine HAVE_COPYSIGN 1
#cmakedefine HAVE_ROUND 1

#cmakedefine HAVE_DIRENT_H 1
#cmakedefine HAVE_DLFCN_H 1
#cmakedefine HAVE_FCNTL_H 1
#cmakedefine HAVE_FORK 1
#cmakedefine HAVE_GETPWNAM 1
#cmakedefine HAVE_INT16_T 1
#cmakedefine HAVE_INT32_T 1
#cmakedefine HAVE_INTTYPES_H 1
#cmakedefine HAVE_MKSTEMP 1
#cmakedefine HAVE_NDIR_H 1
#cmakedefine HAVE_POPEN 1
#cmakedefine HAVE_PWD_H 1
#cmakedefine HAVE_SELECT 1
#cmakedefine HAVE_STDINT_H 1
#cmakedefine HAVE_STRDUP 1
#cmakedefine HAVE_SYSCONF 1
#cmakedefine HAVE_SYSTEM 1
#cmakedefine HAVE_SYS_DIR_H 1
#cmakedefine HAVE_SYS_NDIR_H 1
#cmakedefine HAVE_SYS_STAT_H 1
#cmakedefine HAVE_SYS_TIME_H 1
#cmakedefine HAVE_SYS_TYPES_H 1
#cmakedefine HAVE_SYS_WAIT_H 1
#cmakedefine HAVE_DIRENT_H 1
#cmakedefine HAVE_DLFCN_H 1
#cmakedefine HAVE_FCNTL_H 1
#cmakedefine HAVE_FORK 1
#cmakedefine HAVE_GETPWNAM 1
#cmakedefine HAVE_INT16_T 1
#cmakedefine HAVE_INT32_T 1
#cmakedefine HAVE_INTTYPES_H 1
#cmakedefine HAVE_MKSTEMP 1
#cmakedefine HAVE_NDIR_H 1
#cmakedefine HAVE_POPEN 1
#cmakedefine HAVE_PWD_H 1
#cmakedefine HAVE_SELECT 1
#cmakedefine HAVE_STDINT_H 1
#cmakedefine HAVE_STRDUP 1
#cmakedefine HAVE_SYSCONF 1
#cmakedefine HAVE_SYSTEM 1
#cmakedefine HAVE_SYS_DIR_H 1
#cmakedefine HAVE_SYS_NDIR_H 1
#cmakedefine HAVE_SYS_STAT_H 1
#cmakedefine HAVE_SYS_TIME_H 1
#cmakedefine HAVE_SYS_TYPES_H 1
#cmakedefine HAVE_SYS_WAIT_H 1
#cmakedefine HAVE_SYS_SELECT_H 1
#cmakedefine HAVE_TEMPNAM 1
#cmakedefine HAVE_TMPNAM 1
#cmakedefine HAVE_UNISTD_H 1
#cmakedefine HAVE_VFORK 1
#cmakedefine HAVE_VFORK_H 1
#cmakedefine HAVE_WORKING_FORK 1
#cmakedefine HAVE_WORKING_VFORK 1
#cmakedefine HAVE_ZLIB 1
#cmakedefine HAVE_STRINGS_H 1
#cmakedefine HAVE_SRAND48 1
#cmakedefine HAVE_DRAND48 1
#cmakedefine HAVE_SLEEP 1
#cmakedefine HAVE_TEMPNAM 1
#cmakedefine HAVE_TMPNAM 1
#cmakedefine HAVE_UNISTD_H 1
#cmakedefine HAVE_VFORK 1
#cmakedefine HAVE_VFORK_H 1
#cmakedefine HAVE_WORKING_FORK 1
#cmakedefine HAVE_WORKING_VFORK 1
#cmakedefine HAVE_ZLIB 1
#cmakedefine HAVE_STRINGS_H 1
#cmakedefine HAVE_SRAND48 1
#cmakedefine HAVE_DRAND48 1
#cmakedefine HAVE_SLEEP 1
#cmakedefine HAVE_CLOCK_GETTIME 1
#cmakedefine HAVE_GETTIMEOFDAY 1
#cmakedefine HAVE_RINT 1
Expand Down
Loading