Commit 68b73f89 authored by Dave DeMarle's avatar Dave DeMarle
Browse files

Merge branch 'example-python-module-suffix-rel' into release

Change-Id: I4beda3819e5e68a683f81b738e9be0efdf5a2f04
parents 3198ecc4 26f302fe
...@@ -133,6 +133,10 @@ IF(VTK_FOUND) ...@@ -133,6 +133,10 @@ IF(VTK_FOUND)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}PythonD ${c}PythonD) TARGET_LINK_LIBRARIES(${PROJECT_NAME}PythonD ${c}PythonD)
ENDFOREACH(c) ENDFOREACH(c)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}Python ${PROJECT_NAME}PythonD) TARGET_LINK_LIBRARIES(${PROJECT_NAME}Python ${PROJECT_NAME}PythonD)
SET_TARGET_PROPERTIES(${PROJECT_NAME}Python PROPERTIES PREFIX "")
IF(WIN32 AND NOT CYGWIN)
SET_TARGET_PROPERTIES(${PROJECT_NAME}Python PROPERTIES SUFFIX ".pyd")
ENDIF(WIN32 AND NOT CYGWIN)
ENDIF(VTK_WRAP_PYTHON) ENDIF(VTK_WRAP_PYTHON)
# Create Java wrappers if VTK is wrapped in Java. # Create Java wrappers if VTK is wrapped in Java.
......
...@@ -30,6 +30,10 @@ IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON) ...@@ -30,6 +30,10 @@ IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
ADD_LIBRARY (vtkmyCommonPython MODULE vtkmyCommonPythonInit.cxx) ADD_LIBRARY (vtkmyCommonPython MODULE vtkmyCommonPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkmyCommonPythonD vtkmyCommon vtkCommon vtkCommonPythonD) TARGET_LINK_LIBRARIES(vtkmyCommonPythonD vtkmyCommon vtkCommon vtkCommonPythonD)
TARGET_LINK_LIBRARIES(vtkmyCommonPython vtkmyCommonPythonD) TARGET_LINK_LIBRARIES(vtkmyCommonPython vtkmyCommonPythonD)
SET_TARGET_PROPERTIES(vtkmyCommonPython PROPERTIES PREFIX "")
IF(WIN32 AND NOT CYGWIN)
SET_TARGET_PROPERTIES(vtkmyCommonPython PROPERTIES SUFFIX ".pyd")
ENDIF(WIN32 AND NOT CYGWIN)
ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON) ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
# Create the vtkmyCommon Java library. # Create the vtkmyCommon Java library.
......
...@@ -30,6 +30,10 @@ IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON) ...@@ -30,6 +30,10 @@ IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
ADD_LIBRARY (vtkmyImagingPython MODULE vtkmyImagingPythonInit.cxx) ADD_LIBRARY (vtkmyImagingPython MODULE vtkmyImagingPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkmyImagingPythonD vtkmyImaging vtkmyCommonPythonD vtkImaging vtkImagingPythonD) TARGET_LINK_LIBRARIES(vtkmyImagingPythonD vtkmyImaging vtkmyCommonPythonD vtkImaging vtkImagingPythonD)
TARGET_LINK_LIBRARIES(vtkmyImagingPython vtkmyImagingPythonD) TARGET_LINK_LIBRARIES(vtkmyImagingPython vtkmyImagingPythonD)
SET_TARGET_PROPERTIES(vtkmyImagingPython PROPERTIES PREFIX "")
IF(WIN32 AND NOT CYGWIN)
SET_TARGET_PROPERTIES(vtkmyImagingPython PROPERTIES SUFFIX ".pyd")
ENDIF(WIN32 AND NOT CYGWIN)
ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON) ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
# Create the vtkmyImaging Java library. # Create the vtkmyImaging Java library.
......
...@@ -41,6 +41,10 @@ IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON) ...@@ -41,6 +41,10 @@ IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
ADD_LIBRARY (vtkmyUnsortedPython MODULE vtkmyUnsortedPythonInit.cxx) ADD_LIBRARY (vtkmyUnsortedPython MODULE vtkmyUnsortedPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkmyUnsortedPythonD vtkmyUnsorted vtkmyCommonPythonD) TARGET_LINK_LIBRARIES(vtkmyUnsortedPythonD vtkmyUnsorted vtkmyCommonPythonD)
TARGET_LINK_LIBRARIES(vtkmyUnsortedPython vtkmyUnsortedPythonD) TARGET_LINK_LIBRARIES(vtkmyUnsortedPython vtkmyUnsortedPythonD)
SET_TARGET_PROPERTIES(vtkmyUnsortedPython PROPERTIES PREFIX "")
IF(WIN32 AND NOT CYGWIN)
SET_TARGET_PROPERTIES(vtkmyUnsortedPython PROPERTIES SUFFIX ".pyd")
ENDIF(WIN32 AND NOT CYGWIN)
ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON) ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
# Create the vtkmyUnsorted Java library. # Create the vtkmyUnsorted Java library.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment