Merge pull request #60 from dzenanz/master

Improve compatibility with ITK 4.13

Author: dzenanz

CMakeLists.txt

@@ -1,33 +1,32 @@
 cmake_minimum_required(VERSION 3.10.2)
 
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 11) # Supported values are ``11``, ``14``, and ``17``.
+endif()
+if(NOT CMAKE_CXX_STANDARD_REQUIRED)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+if(NOT CMAKE_CXX_EXTENSIONS)
+  set(CMAKE_CXX_EXTENSIONS OFF)
+endif()
+
 ## If building external to ITK, we need to capture
 ## required build setting from ITK prior to calling
 ## project()
 if(NOT ITK_SOURCE_DIR)
   find_package(ITK REQUIRED)
   list(APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR})
-  if(ITK_VERSION_MAJOR GREATER 4 )
-    if(NOT CMAKE_CXX_STANDARD)
-      set(CMAKE_CXX_STANDARD 11) # Supported values are ``11``, ``14``, and ``17``.
-    endif()
-    if(NOT CMAKE_CXX_STANDARD_REQUIRED)
-      set(CMAKE_CXX_STANDARD_REQUIRED ON)
-    endif()
-    if(NOT CMAKE_CXX_EXTENSIONS)
-      set(CMAKE_CXX_EXTENSIONS OFF)
-    endif()
 
-    foreach(p
-        ## Only policies introduced after the cmake_minimum_required
-        ## version need to explicitly be set to NEW.
-        CMP0070 #3.10.0 Define ``file(GENERATE)`` behavior for relative paths.
-        CMP0071 #3.10.0 Let ``AUTOMOC`` and ``AUTOUIC`` process ``GENERATED`` files.
-        )
-      if(POLICY ${p})
-        cmake_policy(SET ${p} NEW)
-      endif()
-    endforeach()
-  endif()
+  foreach(p
+      ## Only policies introduced after the cmake_minimum_required
+      ## version need to explicitly be set to NEW.
+      CMP0070 #3.10.0 Define ``file(GENERATE)`` behavior for relative paths.
+      CMP0071 #3.10.0 Let ``AUTOMOC`` and ``AUTOUIC`` process ``GENERATED`` files.
+      )
+    if(POLICY ${p})
+      cmake_policy(SET ${p} NEW)
+    endif()
+  endforeach()
 
 
   # Set a default build type if none was specified
@@ -49,6 +48,7 @@ include_directories(${CMAKE_BINARY_DIR})
 if(NOT ITK_SOURCE_DIR)
   include(ITKModuleExternal)
 else()
+  set(ITK_DIR ${CMAKE_BINARY_DIR})
   itk_module_impl()
 endif()
 add_subdirectory(examples)

src/CMakeLists.txt

@@ -1,5 +1,10 @@
 # An option to allow building against ITK before 2018-02-20 when itkBuildInformation.h was not available
-option(ITK_HAS_INFORMATION_H "If itk::BuildInformation::GetInstance is available (after 2018-02-20)" ON)
+if (ITK_VERSION_MAJOR LESS 5)
+  set(HAS_INFO OFF)
+else()
+  set(HAS_INFO ON)
+endif()
+option(ITK_HAS_INFORMATION_H "If itk::BuildInformation::GetInstance is available (after 2018-02-20)" ${HAS_INFO})
 
 include(${CMAKE_CURRENT_LIST_DIR}/../CMake/GetGitRevisionDescription.cmake)
 get_git_head_revision(GIT_CONFIG_REFSPEC GIT_CONFIG_SHA1)