Corrected VTK optionality

diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index cf19966e1bd1027cec29438180d5d11f2c5eab42..778656fa94e638cbf8dcea51c5d69b277472eae5 100755 (executable)
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -2232,6 +2232,10 @@ proc osutils:cmktk { theOutDir theToolKit {theIsExec false} theModule} {
       lappend aFileBuff "  if(USE_OPENCL)"
       lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS ${anUsedUnixLib} )"
       lappend aFileBuff "  endif()"
+    } elseif { $anUsedUnixLib == "VTK" } {
+      lappend aFileBuff "  if(USE_VTK)"
+      lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS ${anUsedUnixLib} )"
+      lappend aFileBuff "  endif()"
     } elseif { $anUsedUnixLib != "" } {
       lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS ${anUsedUnixLib} )"
     }

diff --git a/src/WOKTclLib/templates/template.ac b/src/WOKTclLib/templates/template.ac
index 9ac77a97836e796791fffaa20a85c95408028f9d..ed67b6ed63ae7022587e0d757097034912e75685 100644 (file)
--- a/src/WOKTclLib/templates/template.ac
+++ b/src/WOKTclLib/templates/template.ac
@@ -787,8 +787,8 @@ else
   AC_LANG([C++])
   HAVE_VTK_INC=yes
   if test ! -d $vtk_inc; then
-    DISABLE_VTK_REASON_INC="($vtk_inc directory is not exists)"
-    AC_MSG_ERROR([$vtk_inc directory is not exists])
+    DISABLE_VTK_REASON_INC="($vtk_inc directory does not exists)"
+    AC_MSG_ERROR([$vtk_inc directory does not exists])
   elif test "x$vtk_inc" != "x"; then
      CPPFLAGS="-I$vtk_inc $CPPFLAGS";
   else
@@ -1061,7 +1061,7 @@ else
   fi
 fi
 
-CSF_VTK="$CSF_VTK_LIB"
+#CSF_VTK="$CSF_VTK_LIB"
 AM_CONDITIONAL( HAVE_VTK, [test "xyes" = "x$HAVE_VTK"] )
 
 #----------------------------------------------------------------------