Commit eb2de2a1 authored by Sebastien Barre's avatar Sebastien Barre
Browse files

ENH: More controls in case of the wrong VTK version has been picked.

parent 2b033e10
......@@ -81,6 +81,13 @@ IF (VTK_WRAP_TCL)
ENDIF (NOT VTK_WRAP_TCL_EXE)
ENDIF (VTKMY_WRAP_TCL)
ELSE (VTK_WRAP_TCL)
IF (VTKMY_WRAP_TCL)
MESSAGE("Warning. VTKMY_WRAP_TCL is ON but the VTK version you have chosen has not support for Tcl (VTK_WRAP_TCL is OFF). Please set VTKMY_WRAP_TCL to OFF.")
ENDIF (VTKMY_WRAP_TCL)
ENDIF (VTK_WRAP_TCL)
#
......@@ -123,6 +130,13 @@ IF (VTK_WRAP_PYTHON)
ENDIF (NOT VTK_WRAP_PYTHON_EXE)
ENDIF (VTKMY_WRAP_PYTHON)
ELSE (VTK_WRAP_PYTHON)
IF (VTKMY_WRAP_PYTHON)
MESSAGE("Warning. VTKMY_WRAP_PYTHON is ON but the VTK version you have chosen has not support for Python (VTK_WRAP_PYTHON is OFF). Please set VTKMY_WRAP_PYTHON to OFF.")
ENDIF (VTKMY_WRAP_PYTHON)
ENDIF (VTK_WRAP_PYTHON)
#
......@@ -183,5 +197,12 @@ IF (VTK_WRAP_JAVA)
ENDIF (VTK_WRAP_JAVA_EXE AND VTK_PARSE_JAVA_EXE)
ENDIF (VTKMY_WRAP_JAVA)
ELSE (VTK_WRAP_JAVA)
IF (VTKMY_WRAP_JAVA)
MESSAGE("Warning. VTKMY_WRAP_JAVA is ON but the VTK version you have chosen has not support for Java (VTK_WRAP_JAVA is OFF). Please set VTKMY_WRAP_JAVA to OFF.")
ENDIF (VTKMY_WRAP_JAVA)
ENDIF (VTK_WRAP_JAVA)
......@@ -21,20 +21,21 @@ ADD_LIBRARY (vtkmyCommon Common_SRCS)
# Create the vtkmyCommon Tcl library
#
IF (VTKMY_WRAP_TCL)
IF (VTK_WRAP_TCL AND VTKMY_WRAP_TCL)
VTK_WRAP_TCL (vtkmyCommonTCL CommonTCL_SRCS Common_SRCS)
ADD_LIBRARY (vtkmyCommonTCL CommonTCL_SRCS)
TARGET_LINK_LIBRARIES (vtkmyCommonTCL
vtkCommonTCL
${TCL_LIBRARY})
ENDIF (VTKMY_WRAP_TCL)
ENDIF (VTK_WRAP_TCL AND VTKMY_WRAP_TCL)
#
# Create the vtkmyCommon Python library
#
IF (VTKMY_WRAP_PYTHON)
IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
VTK_WRAP_PYTHON (vtkmyCommonPython CommonPython_SRCS Common_SRCS)
......@@ -57,19 +58,20 @@ IF (VTKMY_WRAP_PYTHON)
${PYTHON_LIBRARY})
ENDIF(WIN32)
ENDIF (VTKMY_WRAP_PYTHON)
ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
#
# Create the vtkmyCommon Java library
#
IF (VTKMY_WRAP_JAVA)
IF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
VTK_WRAP_TCL (vtkmyCommonJava CommonJava_SRCS Common_SRCS)
VTK_WRAP_JAVA (vtkmyCommonJava CommonJava_SRCS Common_SRCS)
ADD_LIBRARY (vtkmyCommonJava SHARED CommonJava_SRCS)
TARGET_LINK_LIBRARIES (vtkmyCommonJava
vtkCommonJava)
ENDIF (VTKMY_WRAP_JAVA)
ENDIF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
#
# Link to VTK and local
......
......@@ -21,7 +21,7 @@ ADD_LIBRARY (vtkmyImaging Imaging_SRCS)
# Create the vtkmyImaging Tcl library
#
IF (VTKMY_WRAP_TCL)
IF (VTK_WRAP_TCL AND VTKMY_WRAP_TCL)
VTK_WRAP_TCL (vtkmyImagingTCL ImagingTCL_SRCS Imaging_SRCS)
ADD_LIBRARY (vtkmyImagingTCL ImagingTCL_SRCS)
......@@ -31,13 +31,13 @@ IF (VTKMY_WRAP_TCL)
vtkmyCommonTCL
vtkCommonTCL
${TCL_LIBRARY})
ENDIF (VTKMY_WRAP_TCL)
ENDIF (VTK_WRAP_TCL AND VTKMY_WRAP_TCL)
#
# Create the vtkmyImaging Python library
#
IF (VTKMY_WRAP_PYTHON)
IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
VTK_WRAP_PYTHON (vtkmyImagingPython ImagingPython_SRCS Imaging_SRCS)
......@@ -69,22 +69,23 @@ IF (VTKMY_WRAP_PYTHON)
${PYTHON_LIBRARY})
ENDIF(WIN32)
ENDIF (VTKMY_WRAP_PYTHON)
ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
#
# Create the vtkmyImaging Java library
#
IF (VTKMY_WRAP_JAVA)
IF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
VTK_WRAP_TCL (vtkmyImagingJava ImagingJava_SRCS Imaging_SRCS)
VTK_WRAP_JAVA (vtkmyImagingJava ImagingJava_SRCS Imaging_SRCS)
ADD_LIBRARY (vtkmyImagingJava SHARED ImagingJava_SRCS)
TARGET_LINK_LIBRARIES (vtkmyImagingJava
vtkImagingJava
vtkFilteringJava
vtkmyCommonJava
vtkCommonJava)
ENDIF (VTKMY_WRAP_JAVA)
ENDIF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
#
# Link to VTK and local
......
......@@ -21,7 +21,7 @@ ADD_LIBRARY (vtkmyUnsorted Unsorted_SRCS)
# Create the vtkmyUnsorted Tcl library
#
IF (VTKMY_WRAP_TCL)
IF (VTK_WRAP_TCL AND VTKMY_WRAP_TCL)
VTK_WRAP_TCL (vtkmyUnsortedTCL UnsortedTCL_SRCS Unsorted_SRCS)
ADD_LIBRARY (vtkmyUnsortedTCL UnsortedTCL_SRCS)
......@@ -50,13 +50,13 @@ IF (VTKMY_WRAP_TCL)
TARGET_LINK_LIBRARIES (vtkmyUnsortedTCL vtkRenderingTCL)
ENDIF (VTK_USE_RENDERING)
ENDIF (VTKMY_WRAP_TCL)
ENDIF (VTK_WRAP_TCL AND VTKMY_WRAP_TCL)
#
# Create the vtkmyUnsorted Python library
#
IF (VTKMY_WRAP_PYTHON)
IF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
VTK_WRAP_PYTHON (vtkmyUnsortedPython UnsortedPython_SRCS Unsorted_SRCS)
......@@ -105,15 +105,15 @@ IF (VTKMY_WRAP_PYTHON)
TARGET_LINK_LIBRARIES (vtkmyUnsortedPython vtkRenderingPython)
ENDIF (VTK_USE_RENDERING)
ENDIF (VTKMY_WRAP_PYTHON)
ENDIF (VTK_WRAP_PYTHON AND VTKMY_WRAP_PYTHON)
#
# Create the vtkmyUnsorted Java library
#
IF (VTKMY_WRAP_JAVA)
IF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
VTK_WRAP_TCL (vtkmyUnsortedJava UnsortedJava_SRCS Unsorted_SRCS)
VTK_WRAP_JAVA (vtkmyUnsortedJava UnsortedJava_SRCS Unsorted_SRCS)
ADD_LIBRARY (vtkmyUnsortedJava SHARED UnsortedJava_SRCS)
TARGET_LINK_LIBRARIES (vtkmyUnsortedJava
vtkIOJava
......@@ -139,7 +139,7 @@ IF (VTKMY_WRAP_JAVA)
TARGET_LINK_LIBRARIES (vtkmyUnsortedJava vtkRenderingJava)
ENDIF (VTK_USE_RENDERING)
ENDIF (VTKMY_WRAP_JAVA)
ENDIF (VTK_WRAP_JAVA AND VTKMY_WRAP_JAVA)
#
# Link to VTK and local
......
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