Skip to content

Commit

Permalink
BUG: Fix wrapping install component identifier
Browse files Browse the repository at this point in the history
  • Loading branch information
thewtex committed Sep 11, 2018
1 parent 5b9fa07 commit 6dc8574
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
1 change: 1 addition & 0 deletions scripts/internal/manylinux-build-module-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
-Wno-dev \
-DITK_DIR:PATH=${itk_build_dir} \
-DVTK_DIR:PATH=${vtk_build_dir} \
-DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
-DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -p)-linux-gnu \
-DBUILD_TESTING:BOOL=OFF \
-DITK_WRAP_PYTHON:BOOL=ON \
Expand Down
15 changes: 7 additions & 8 deletions wrapping/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ itk_wrap_module(ITKVtkGlue)
set(ITK_WRAP_PYTHON_LIBRARY_IMPORTS "import vtk\n${ITK_WRAP_PYTHON_LIBRARY_IMPORTS}")
itk_end_wrap_module()

if(ITK_WRAP_PYTHON AND PYTHON_VERSION_STRING VERSION_LESS 3.0)
if(${VTK_VERSION} VERSION_LESS 6.0.0)
target_link_libraries_with_dynamic_lookup(ITKVtkGluePython vtkImagingPythonD vtkPythonCore)
elseif(TARGET vtkImagingKitPythonD)
target_link_libraries_with_dynamic_lookup(ITKVtkGluePython vtkImagingKitPythonD)
else()
target_link_libraries_with_dynamic_lookup(ITKVtkGluePython vtkImagingCorePythonD)
endif()
if(${VTK_VERSION} VERSION_LESS 6.0.0)
target_link_libraries_with_dynamic_lookup(ITKVtkGluePython vtkImagingPythonD vtkPythonCore)
elseif(TARGET vtkImagingKitPythonD)
target_link_libraries_with_dynamic_lookup(ITKVtkGluePython vtkImagingKitPythonD)
else()
target_link_libraries_with_dynamic_lookup(ITKVtkGluePython vtkImagingCorePythonD)
endif()

0 comments on commit 6dc8574

Please sign in to comment.