Merge pull request #132 from LecrisUT/cmake/maintenance

Author: gdevenyi

CMakeLists.txt

@@ -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)
 
@@ -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)
@@ -56,11 +54,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)
@@ -450,7 +452,7 @@ endif()
 
 # Keep this variable for compatibility
 set(VOLUME_IO_LIBRARY  minc2)
-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} )
 

cmake-modules/BuildNIFTI.cmake

@@ -75,7 +75,7 @@ macro(build_nifti install_prefix staging_prefix)
             -DCMAKE_SKIP_RPATH:BOOL=OFF
             -DCMAKE_SKIP_INSTALL_RPATH:BOOL=OFF
             -DMACOSX_RPATH:BOOL=ON
-            -DCMAKE_INSTALL_RPATH:PATH=${install_prefix}/lib${LIB_SUFFIX}
+            -DCMAKE_INSTALL_RPATH:PATH=${install_prefix}/${CMAKE_INSTALL_LIBDIR}
             -DCMAKE_INSTALL_PREFIX:PATH=${install_prefix}
             "-DCMAKE_CXX_FLAGS_RELEASE:STRING=${NIFTI_CMAKE_CXX_FLAGS_RELEASE}"
             "-DCMAKE_C_FLAGS_RELEASE:STRING=${NIFTI_CMAKE_C_FLAGS_RELEASE}"
@@ -95,9 +95,9 @@ macro(build_nifti install_prefix staging_prefix)
     INSTALL_DIR ${staging_prefix}/${install_prefix}
   )
 
-set(NIFTI_LIBRARY     ${staging_prefix}/${install_prefix}/lib${LIB_SUFFIX}/libniftiio.a )
+set(NIFTI_LIBRARY     ${staging_prefix}/${install_prefix}/${CMAKE_INSTALL_LIBDIR}/libniftiio.a )
 set(NIFTI_INCLUDE_DIR ${staging_prefix}/${install_prefix}/include/nifti )
-set(ZNZ_LIBRARY       ${staging_prefix}/${install_prefix}/lib${LIB_SUFFIX}/libznz.a )
+set(ZNZ_LIBRARY       ${staging_prefix}/${install_prefix}/${CMAKE_INSTALL_LIBDIR}/libznz.a )
 set(ZNZ_INCLUDE_DIR   ${staging_prefix}/${install_prefix}/include/nifti )
 set(NIFTI_FOUND       ON)
 

ezminc/examples/Example_CMakeLists.txt

@@ -1,8 +1,8 @@
 # Example CMakeLists.txt to work with minc&EZminc
 
+cmake_minimum_required(VERSION 2.8...4.0)
 
 project(EXAMPLE)
-cmake_minimum_required(VERSION 2.8)
 
 find_package(LIBMINC REQUIRED)
 include( ${LIBMINC_USE_FILE} )