From 987b7560ceb056b25612b1ac7556ca5d0387ea24 Mon Sep 17 00:00:00 2001
From: Niels Dekker <N.Dekker@lumc.nl>
Date: Wed, 19 Jul 2023 16:53:24 +0200
Subject: [PATCH 1/2] ENH: Bump elastix version to 2023-07-19, inc.
 SetInitialTransform

Follow-up to https://github.com/InsightSoftwareConsortium/ITKElastix/pull/211
commit 1043f103ae72ab644c09554e8bfd88581b529e30 "ENH: Bump elastix version to
2023-05-15, use C++17"

Including:

  https://github.com/SuperElastix/elastix/pull/936
  https://github.com/SuperElastix/elastix/commit/115d8e1c7b0b23973bfc919a2bf4768f32e4e843
  ENH: Add `ElastixRegistrationMethod::SetInitialTransform

  https://github.com/SuperElastix/elastix/pull/933
  https://github.com/SuperElastix/elastix/commit/d33a0d557537c85e5d5b3d6c66d7552260e5ea64
  BUG: Fix reference count in ConvertItkTransformBaseToSingleItkTransform

  https://github.com/SuperElastix/elastix/pull/924
  https://github.com/SuperElastix/elastix/commit/71a4a9ae60e63c1a81337810c5170c317ff82923
  ENH: Add TransformParameterFileName property to TransformixFilter

  https://github.com/SuperElastix/elastix/pull/922
  https://github.com/SuperElastix/elastix/commit/9d76b86f955043e2ae17bbbd621aaa5f0f60e001
  ENH: Restore ELASTIX_BUILD_EXECUTABLE CMake option

  https://github.com/SuperElastix/elastix/pull/909
  https://github.com/SuperElastix/elastix/commit/9e64269bb40f9275015d557263acf1f382436087
  ENH: ElastixRegistrationMethod writes initial transform parameter files

  https://github.com/SuperElastix/elastix/pull/903
  https://github.com/SuperElastix/elastix/commit/2170592cbd018cce65698d404cae281f40c28d39
  ENH: Remove the letter 's' from "InitialTransformParametersFileName"

  https://github.com/SuperElastix/elastix/pull/898
  https://github.com/SuperElastix/elastix/commit/691c35869c01d63cb88f716dc9312cc485ead83b
  BUG: Add InitialTransformParameterObject maps to registration result
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 068a4b27..f4c60755 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ if(SKBUILD)
 endif()
 
 set(elastix_GIT_REPOSITORY "https://github.com/SuperElastix/elastix.git")
-set(elastix_GIT_TAG "b9b8e20aef83f94ed38a81cc38625a1bfddf1053")
+set(elastix_GIT_TAG "115d8e1c7b0b23973bfc919a2bf4768f32e4e843")
 FetchContent_Declare(
   elx
   GIT_REPOSITORY ${elastix_GIT_REPOSITORY}

From 9327b3c0ab61926d1f311e12e79b6dd2773fa161 Mon Sep 17 00:00:00 2001
From: Niels Dekker <N.Dekker@lumc.nl>
Date: Fri, 21 Jul 2023 14:02:02 +0200
Subject: [PATCH 2/2] COMP: Ensure that C++ standard version is at least C++17

Aims to avoid compile errors from macosx-10.9-universal2-3.11/Xcode_13.2.1
MacOSX12.1.sdk/AppleClang 13.0.0.13000029 saying:

> error: no template named 'is_integral_v' in namespace 'std'; did you mean 'is_integral'?
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4c60755..11b1521f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16.3)
 project(Elastix)
 
-if(NOT CMAKE_CXX_STANDARD)
+if(NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 17)
   # SuperElastix/elastix uses C++17 specific features in some of its header files.
   set(CMAKE_CXX_STANDARD 17)
 endif()