Commit d2ce2954 authored by Dave Partyka's avatar Dave Partyka Committed by Kitware Robot
Browse files

Merge topic 'interface-libraries'

7aae3c2b Add PYTHON_LIBRARY as an interace to vtkPythonCore.
parents edb4dbef 7aae3c2b
...@@ -52,6 +52,7 @@ ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT) ...@@ -52,6 +52,7 @@ ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
# immediately. # immediately.
IF(WIN32 OR APPLE) IF(WIN32 OR APPLE)
TARGET_LINK_LIBRARIES (vtkPythonCore ${VTK_PYTHON_LIBRARIES}) TARGET_LINK_LIBRARIES (vtkPythonCore ${VTK_PYTHON_LIBRARIES})
TARGET_LINK_LIBRARIES (vtkPythonCore LINK_INTERFACE_LIBRARIES ${VTK_PYTHON_LIBRARIES})
ENDIF(WIN32 OR APPLE) ENDIF(WIN32 OR APPLE)
# Apply user-defined properties to the library targets. # Apply user-defined properties to the library targets.
...@@ -254,6 +255,8 @@ IF(VTK_USE_FFMPEG_ENCODER) ...@@ -254,6 +255,8 @@ IF(VTK_USE_FFMPEG_ENCODER)
ENDIF(VTK_USE_FFMPEG_ENCODER) ENDIF(VTK_USE_FFMPEG_ENCODER)
TARGET_LINK_LIBRARIES(vtkpython ${VTKPYTHON_LINK_LIBS}) TARGET_LINK_LIBRARIES(vtkpython ${VTKPYTHON_LINK_LIBS})
TARGET_LINK_LIBRARIES(vtkpython LINK_INTERFACE_LIBRARIES ${VTK_PYTHON_LIBRARIES})
message("VTK_PYTHON_LIBRARIES ${VTK_PYTHON_LIBRARIES}")
IF(VTK_USE_MATLAB_MEX) IF(VTK_USE_MATLAB_MEX)
INCLUDE(${MATLAB_MEX_USE_FILE}) INCLUDE(${MATLAB_MEX_USE_FILE})
...@@ -285,6 +288,7 @@ IF (VTK_USE_PARALLEL AND VTK_USE_MPI) ...@@ -285,6 +288,7 @@ IF (VTK_USE_PARALLEL AND VTK_USE_MPI)
SET(PVTKPYTHON_EXECUTABLE pvtkpython) SET(PVTKPYTHON_EXECUTABLE pvtkpython)
VTK_ADD_EXECUTABLE(pvtkpython vtkParaPythonAppInit.cxx) VTK_ADD_EXECUTABLE(pvtkpython vtkParaPythonAppInit.cxx)
TARGET_LINK_LIBRARIES(pvtkpython ${VTKPYTHON_LINK_LIBS} ${MPI_LIBRARIES}) TARGET_LINK_LIBRARIES(pvtkpython ${VTKPYTHON_LINK_LIBS} ${MPI_LIBRARIES})
TARGET_LINK_LIBRARIES(vtkpython LINK_INTERFACE_LIBRARIES ${VTK_PYTHON_LIBRARIES})
IF(VTK_USE_MATLAB_MEX) IF(VTK_USE_MATLAB_MEX)
INCLUDE(${MATLAB_MEX_USE_FILE}) INCLUDE(${MATLAB_MEX_USE_FILE})
SET_TARGET_PROPERTIES(pvtkpython PROPERTIES SET_TARGET_PROPERTIES(pvtkpython PROPERTIES
......
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