Fixed for new itk python wrappings files structure

espdev · espdev · commit e88692a57a96 · 2016-06-03T04:23:52.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,18 +33,22 @@ find_package(PythonInterp ${python_version_major_minor} EXACT REQUIRED)
 
 set(TARGET_DIR "${CMAKE_BINARY_DIR}/lib")
 set(TARGET_ITK_DIR "${TARGET_DIR}/itk")
+set(PACKAGE_ITK_DIR "${TARGET_DIR}/itk/itk")
 set(WHEEL_DIR "${CMAKE_BINARY_DIR}/wheelhouse")
 
 set(COPY_FILES_COMMAND "${TARGET_DIR}/copy_files.py")
 
 # Copying the necessary files and building wheel package
 add_custom_target(pip_wheel ALL
-    COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/lib" "${TARGET_ITK_DIR}"
-    COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/lib/$(Configuration)" "${TARGET_ITK_DIR}"
-    COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/bin/$(Configuration)" "${TARGET_ITK_DIR}"
+    COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/lib" "${PACKAGE_ITK_DIR}"
+    COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/lib/$(Configuration)" "${PACKAGE_ITK_DIR}"
+    COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/bin/$(Configuration)" "${PACKAGE_ITK_DIR}"
+    COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/Wrapping/Generators/Python" "${TARGET_ITK_DIR}"
     COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/Wrapping/Generators/Python/$(Configuration)" "${TARGET_ITK_DIR}"
-    COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/Wrapping/Generators/Python/Configuration" "${TARGET_ITK_DIR}/Configuration"
+    COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/Wrapping/Generators/Python/$(Configuration)/itk" "${PACKAGE_ITK_DIR}"
+    COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/Wrapping/Generators/Python/Configuration" "${PACKAGE_ITK_DIR}/Configuration"
     COMMAND ${PYTHON_EXECUTABLE} ${COPY_FILES_COMMAND} "${ITK_DIR}/Wrapping/Generators/Python/InstallOnly" "${TARGET_ITK_DIR}"
+    COMMAND ${CMAKE_COMMAND} -E remove ${TARGET_ITK_DIR}/itk.py
     COMMAND ${PYTHON_EXECUTABLE} "-m" "pip" "wheel" "--wheel-dir" "${WHEEL_DIR}" "."
     WORKING_DIRECTORY "${TARGET_DIR}"
 )
diff --git a/setup.py.in b/setup.py.in
@@ -25,6 +25,8 @@ ITK include:
     - Grow a self-sustaining community of software users and developers.
 """
 
+GLOBS = ['itk/'+glob for glob in '@GLOB_COPY_FILES@'.split(';')]
+
 
 class BinaryDistribution(Distribution):
     def is_pure(self):
@@ -42,8 +44,8 @@ setup(
     packages=['itk'],
     include_package_data=True,
     package_data={
-        '': '@GLOB_COPY_FILES@'.split(';'),
-        'itk': ['Configuration/*.py', '../itk.pth']
+        'itk': GLOBS + ['itk/Configuration/*.py'],
+        '': ['*.py', '../itk.pth'],
     },
     distclass=BinaryDistribution,
 )
