Commit 8ee99f5e authored by Brad King's avatar Brad King 💬
Browse files

BUG: Calls to VTK_WRAP_PYTHON3 and VTK_WRAP_JAVA3 need to pass the list of...

BUG: Calls to VTK_WRAP_PYTHON3 and VTK_WRAP_JAVA3 need to pass the list of sources to wrap as a single argument in double-quotes because they are macros.
parent a009f9dd
......@@ -117,7 +117,7 @@ IF(VTK_FOUND)
# Create Python wrappers if VTK is wrapped in Python.
IF(VTK_WRAP_PYTHON)
INCLUDE(${VTK_CMAKE_DIR}/vtkWrapPython.cmake)
VTK_WRAP_PYTHON3(${PROJECT_NAME}Python vtkLocalPYTHON_SRCS ${vtkLocal_SRCS})
VTK_WRAP_PYTHON3(${PROJECT_NAME}Python vtkLocalPYTHON_SRCS "${vtkLocal_SRCS}")
ADD_LIBRARY(${PROJECT_NAME}PythonD ${vtkLocalPYTHON_SRCS})
ADD_LIBRARY(${PROJECT_NAME}Python MODULE ${PROJECT_NAME}PythonInit.cxx)
TARGET_LINK_LIBRARIES(${PROJECT_NAME}PythonD ${PROJECT_NAME})
......@@ -134,7 +134,7 @@ IF(VTK_FOUND)
SET(VTK_WRAP_HINTS "${PROJECT_SOURCE_DIR}/hints")
SET(VTK_JAVA_HOME ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME})
MAKE_DIRECTORY(${VTK_JAVA_HOME})
VTK_WRAP_JAVA3(${PROJECT_NAME}Java vtkLocalJAVA_SRCS ${vtkLocal_SRCS})
VTK_WRAP_JAVA3(${PROJECT_NAME}Java vtkLocalJAVA_SRCS "${vtkLocal_SRCS}")
ADD_LIBRARY(${PROJECT_NAME}Java ${vtkLocalJAVA_SRCS})
TARGET_LINK_LIBRARIES(${PROJECT_NAME}Java ${PROJECT_NAME})
FOREACH(c ${vtkLocal_LIBS})
......
......@@ -24,7 +24,7 @@ ENDIF (VTK_WRAP_TCL AND VTKMY_WRAP_TCL)
# Create the vtkmyCommon Python library.
IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
VTK_WRAP_PYTHON3 (vtkmyCommonPython CommonPython_SRCS ${Common_SRCS})
VTK_WRAP_PYTHON3 (vtkmyCommonPython CommonPython_SRCS "${Common_SRCS}")
ADD_LIBRARY (vtkmyCommonPythonD ${CommonPython_SRCS})
ADD_LIBRARY (vtkmyCommonPython MODULE vtkmyCommonPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkmyCommonPythonD vtkmyCommon vtkCommon vtkCommonPythonD)
......@@ -33,7 +33,7 @@ ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
# Create the vtkmyCommon Java library.
IF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
VTK_WRAP_JAVA3 (vtkmyCommonJava CommonJava_SRCS ${Common_SRCS})
VTK_WRAP_JAVA3 (vtkmyCommonJava CommonJava_SRCS "${Common_SRCS}")
ADD_LIBRARY (vtkmyCommonJava SHARED ${CommonJava_SRCS})
TARGET_LINK_LIBRARIES (vtkmyCommonJava vtkmyCommon vtkCommonJava)
ENDIF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
......@@ -24,7 +24,7 @@ ENDIF (VTK_WRAP_TCL AND VTKMY_WRAP_TCL)
# Create the vtkmyImaging Python library.
IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
VTK_WRAP_PYTHON3 (vtkmyImagingPython ImagingPython_SRCS ${Imaging_SRCS})
VTK_WRAP_PYTHON3 (vtkmyImagingPython ImagingPython_SRCS "${Imaging_SRCS}")
ADD_LIBRARY (vtkmyImagingPythonD ${ImagingPython_SRCS})
ADD_LIBRARY (vtkmyImagingPython MODULE vtkmyImagingPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkmyImagingPythonD vtkmyImaging vtkmyCommonPythonD vtkImaging vtkImagingPythonD)
......@@ -33,7 +33,7 @@ ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
# Create the vtkmyImaging Java library.
IF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
VTK_WRAP_JAVA3 (vtkmyImagingJava ImagingJava_SRCS ${Imaging_SRCS})
VTK_WRAP_JAVA3 (vtkmyImagingJava ImagingJava_SRCS "${Imaging_SRCS}")
ADD_LIBRARY (vtkmyImagingJava SHARED ${ImagingJava_SRCS})
TARGET_LINK_LIBRARIES (vtkmyImagingJava vtkmyCommonJava vtkmyImaging vtkImagingJava)
ENDIF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
......@@ -35,7 +35,7 @@ ENDIF (VTK_WRAP_TCL AND VTKMY_WRAP_TCL)
# Create the vtkmyUnsorted Python library.
IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
VTK_WRAP_PYTHON3 (vtkmyUnsortedPython UnsortedPython_SRCS ${Unsorted_SRCS})
VTK_WRAP_PYTHON3 (vtkmyUnsortedPython UnsortedPython_SRCS "${Unsorted_SRCS}")
ADD_LIBRARY (vtkmyUnsortedPythonD ${UnsortedPython_SRCS})
ADD_LIBRARY (vtkmyUnsortedPython MODULE vtkmyUnsortedPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkmyUnsortedPythonD vtkmyUnsorted vtkmyCommonPythonD)
......@@ -44,7 +44,7 @@ ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
# Create the vtkmyUnsorted Java library.
IF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
VTK_WRAP_JAVA3 (vtkmyUnsortedJava UnsortedJava_SRCS ${Unsorted_SRCS})
VTK_WRAP_JAVA3 (vtkmyUnsortedJava UnsortedJava_SRCS "${Unsorted_SRCS}")
ADD_LIBRARY (vtkmyUnsortedJava SHARED ${UnsortedJava_SRCS})
TARGET_LINK_LIBRARIES(vtkmyUnsortedJava vtkmyCommonJava vtkmyUnsorted)
ENDIF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
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