ENH: Move cmake config items into common itkConfig.py.in file

Compiletime file configurations should be kept to a minimum to avoid complicating debugging By moving the version string into itkConfig.py.in we can avoid needing to generate the already complicated __init__.py file.
InsightSoftwareConsortium · Oct 16, 2020 · a867b5e · a867b5e
1 parent c7c0736
commit a867b5e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/Wrapping/Generators/Python/CMakeLists.txt b/Wrapping/Generators/Python/CMakeLists.txt
@@ -149,6 +149,7 @@ if(NOT EXTERNAL_WRAP_ITK_PROJECT)
     itkExtras
     itkLazy
     itkHelpers
+    itk/__init__
     )
   # Done listing files.
 
@@ -191,20 +192,12 @@ if(NOT EXTERNAL_WRAP_ITK_PROJECT)
                    "${CMAKE_CURRENT_BINARY_DIR}/${config}/WrapITK.pth"
                    @ONLY)
       # Install the package python files.
-      set(init_file ${CMAKE_CURRENT_BINARY_DIR}/${config}/itk/__init__.py)
-      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/itk/__init__.py.in
-        "${init_file}"
-        )
       WRAP_ITK_PYTHON_BINDINGS_INSTALL(/itk "ITKCommon" ${init_file})
       set(python_modules ${ITK_WRAP_PYTHON_INSTALL_FILES})
       WRAP_ITK_PYTHON_BINDINGS_INSTALL(/ "ITKCommon" ${python_modules})
     endforeach()
   else()
     # Install the package python files.
-    set(init_file ${CMAKE_CURRENT_BINARY_DIR}/itk/__init__.py)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/itk/__init__.py.in
-      ${CMAKE_CURRENT_BINARY_DIR}/itk/__init__.py
-      )
     WRAP_ITK_PYTHON_BINDINGS_INSTALL(/itk "ITKCommon" ${init_file})
     set(python_modules ${ITK_WRAP_PYTHON_INSTALL_FILES})
     WRAP_ITK_PYTHON_BINDINGS_INSTALL(/ "ITKCommon" ${python_modules})

diff --git a/...ping/Generators/Python/itk/__init__.py.in → Wrapping/Generators/Python/itk/__init__.py b/...ping/Generators/Python/itk/__init__.py.in → Wrapping/Generators/Python/itk/__init__.py
@@ -25,7 +25,7 @@
 import os
 import sys
 
-__version__ = "@ITK_VERSION_MAJOR@.@ITK_VERSION_MINOR@.@ITK_VERSION_PATCH@"
+__version__ = itkConfig.ITK_GLOBAL_VERSION_STRING
 thisModule = sys.modules[__name__]
 
 

diff --git a/Wrapping/Generators/Python/itkConfig.py.in b/Wrapping/Generators/Python/itkConfig.py.in
@@ -92,5 +92,7 @@ if "WRAPITK_PYTHON_PATH" in os.environ:
 
 doxygen_root = normalized_path("../Doc")
 
+ITK_GLOBAL_VERSION_STRING :str = "@ITK_VERSION_MAJOR@.@ITK_VERSION_MINOR@.@ITK_VERSION_PATCH@"
+
 del normalized_path
 del os