Update from November 23, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@576 18c085ea-50e0-402c-830e-de6fd14e8384

clearcase_bin/visit-build-closed

@@ -400,6 +400,7 @@ mv white_$dist.tar.gz /p/gw1/$user/white/visitbuild/$dist.tar.gz
 cd /p/gw1/$user/white/visitbuild
 gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
 cd $dist
+cp /usr/gapps/visit/bz2/bzlib.h include
 ver=\`cat VERSION\`
 ver2=\`echo \$ver | tr "." "_"\`
 env CXXFLAGS=-O2 MAKE=gmake ./configure --enable-parallel >> ../buildlog 2>&1

clearcase_bin/visit-build-open

@@ -52,11 +52,12 @@ esac
 kickit=true
 hoth=true
 sunspot=true
-hyper=true
+quad=false
 gps=true
 berg=true
 up=true
 pengra=true
+mcr=true
 thunder=true
 
 dist=undefined
@@ -73,11 +74,12 @@ do
          kickit=false
          hoth=false
          sunspot=false
-         hyper=false
+         quad=false
          gps=false
          berg=false
          up=false
          pengra=false
+         mcr=false
          thunder=false
          shift
          ;;
@@ -105,12 +107,12 @@ do
          sunspot=true
          shift
          ;;
-      -hyper)
-         hyper=false
+      -quad)
+         quad=false
          shift
          ;;
-      +hyper)
-         hyper=true
+      +quad)
+         quad=true
          shift
          ;;
       -gps)
@@ -145,6 +147,14 @@ do
          pengra=true
          shift
          ;;
+      -mcr)
+         mcr=false
+         shift
+         ;;
+      +mcr)
+         mcr=true
+         shift
+         ;;
       -thunder)
          thunder=false
          shift
@@ -330,21 +340,21 @@ then
 fi
 
 #
-# Build on hyper.
+# Build on quad.
 #
-rm -f hyper
-cat <<EOF > hyper
+rm -f quad
+cat <<EOF > quad
 #!/bin/sh
-if test ! -d /scratch1/$user ; then
-   mkdir /scratch1/$user
+if test ! -d /usr/tmp/$user ; then
+   mkdir /usr/tmp/$user
 fi
-if test ! -d /scratch1/$user/hyper ; then
-   mkdir /scratch1/$user/hyper
+if test ! -d /usr/tmp/$user/quad ; then
+   mkdir /usr/tmp/$user/quad
 fi
-rm -rf /scratch1/$user/hyper/visitbuild
-mkdir /scratch1/$user/hyper/visitbuild
-mv hyper_$dist.tar.gz /scratch1/$user/hyper/visitbuild/$dist.tar.gz
-cd /scratch1/$user/hyper/visitbuild
+rm -rf /usr/tmp/$user/quad/visitbuild
+mkdir /usr/tmp/$user/quad/visitbuild
+mv quad_$dist.tar.gz /usr/tmp/$user/quad/visitbuild/$dist.tar.gz
+cd /usr/tmp/$user/quad/visitbuild
 gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
 cd $dist
 ver=\`cat VERSION\`
@@ -355,8 +365,8 @@ clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
 mv visit\$ver2.irix6.tar.gz ..
 cd ..
 rm -f resultlog
-echo "        build of visit on hyper"        > resultlog 2>&1
-echo "       -------------------------"       >> resultlog 2>&1
+echo "        build of visit on quad"         > resultlog 2>&1
+echo "       ------------------------"        >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
 ls -l                                         >> resultlog 2>&1
 echo ""                                       >> resultlog 2>&1
@@ -369,13 +379,13 @@ ls $dist/plugins/databases/libI* | sed "s/$dist\/plugins\/databases\/libI//" | s
 mail $emailName < resultlog
 EOF
 
-if [ $hyper = true ]
+if [ $quad = true ]
 then
    if [ $test = no ]
    then
-      scp hyper hyper:hyper_buildit
-      scp $dist.tar.gz hyper:hyper_$dist.tar.gz
-      ssh hyper "chmod 750 hyper_buildit;./hyper_buildit" &
+      scp quad quad:quad_buildit
+      scp $dist.tar.gz quad:quad_$dist.tar.gz
+      ssh quad "chmod 750 quad_buildit;./quad_buildit" &
    fi
 fi
 
@@ -579,6 +589,56 @@ then
    fi
 fi
 
+#
+# Build on mcr.
+#
+rm -f mcr
+cat <<EOF > mcr
+#!/bin/sh
+if test ! -d /usr/tmp/$user ; then
+   mkdir /usr/tmp/$user
+fi
+if test ! -d /usr/tmp/$user/mcr ; then
+   mkdir /usr/tmp/$user/mcr
+fi
+rm -rf /usr/tmp/$user/mcr/visitbuild
+mkdir /usr/tmp/$user/mcr/visitbuild
+mv mcr_$dist.tar.gz /usr/tmp/$user/mcr/visitbuild/$dist.tar.gz
+cd /usr/tmp/$user/mcr/visitbuild
+gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
+cd $dist
+ver=\`cat VERSION\`
+ver2=\`echo \$ver | tr "." "_"\`
+env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
+make -j 3 >> ../buildlog 2>&1
+clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
+mv visit\$ver2.linux.tar.gz ..
+cd ..
+rm -f resultlog
+echo "        build of visit on mcr"          > resultlog 2>&1
+echo "       -----------------------"         >> resultlog 2>&1
+echo ""                                       >> resultlog 2>&1
+ls -l                                         >> resultlog 2>&1
+echo ""                                       >> resultlog 2>&1
+echo "number of database plugins = "\`ls $dist/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
+echo "number of operator plugins = "\`ls $dist/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
+echo "number of plot plugins = "\`ls $dist/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
+echo ""                                       >> resultlog 2>&1
+echo "The database plugins:"                  >> resultlog 2>&1
+ls $dist/plugins/databases/libI* | sed "s/$dist\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
+mail $emailName < resultlog
+EOF
+
+if [ $mcr = true ]
+then
+   if [ $test = no ]
+   then
+      scp mcr mcr37:mcr_buildit
+      scp $dist.tar.gz mcr37:mcr_$dist.tar.gz
+      ssh mcr37 "chmod 750 mcr_buildit;./mcr_buildit" &
+   fi
+fi
+
 #
 # Build on thunder.
 #
@@ -634,5 +694,5 @@ fi
 #
 if [ $test = no ]
 then
-   rm -f kickit hoth sunspot hyper gps berg up pengra thunder
+   rm -f kickit hoth sunspot quad gps berg up pengra mcr thunder
 fi

clearcase_bin/visit-install-open

@@ -52,12 +52,11 @@ esac
 #
 hoth=true
 sunspot=true
-hyper=true
+quad=false
 gps=true
 berg=true
 up=true
-pengra=true
-alc=true
+mcr=true
 thunder=true
 
 ver=undefined
@@ -74,12 +73,11 @@ do
       -none)
          hoth=false
          sunspot=false
-         hyper=false
+         quad=false
          gps=false
          berg=false
          up=false
-         pengra=false
-         alc=false
+         mcr=false
          thunder=false
          shift
          ;;
@@ -99,12 +97,12 @@ do
          sunspot=true
          shift
          ;;
-      -hyper)
-         hyper=false
+      -quad)
+         quad=false
          shift
          ;;
-      +hyper)
-         hyper=true
+      +quad)
+         quad=true
          shift
          ;;
       -gps)
@@ -131,20 +129,12 @@ do
          up=true
          shift
          ;;
-      -pengra)
-         pengra=false
+      -mcr)
+         mcr=false
          shift
          ;;
-      +pengra)
-         pengra=true
-         shift
-         ;;
-      -alc)
-         alc=false
-         shift
-         ;;
-      +alc)
-         alc=true
+      +mcr)
+         mcr=true
          shift
          ;;
       -thunder)
@@ -242,7 +232,7 @@ fi
 rm -f sunspot
 cat <<EOF > sunspot
 #!/bin/sh
-./visit-install -private -c open -g visit -gw -l $ver sunos5 /usr/gapps/visit > installlog 2>&1
+./visit-install $verflag -c open -g visit -gw -l $ver sunos5 /usr/gapps/visit > installlog 2>&1
 rm -f resultlog
 echo "        install of visit on sunspot"         > resultlog 2>&1
 echo "       -----------------------------"        >> resultlog 2>&1
@@ -273,15 +263,15 @@ then
 fi
 
 #
-# Install on hyper.
+# Install on quad.
 #
-rm -f hyper
-cat <<EOF > hyper
+rm -f quad
+cat <<EOF > quad
 #!/bin/sh
-./visit-install $verflag -c open -g visit -gw -l $ver irix6 /usr/gapps/visit > installlog 2>&1
+./visit-install -r -private -c open -g visit -gw -l $ver irix6 /usr/gapps/visit > installlog 2>&1
 rm -f resultlog
-echo "        install of visit on hyper"           > resultlog 2>&1
-echo "       ---------------------------"          >> resultlog 2>&1
+echo "        install of visit on quad"            > resultlog 2>&1
+echo "       --------------------------"           >> resultlog 2>&1
 echo ""                                            >> resultlog 2>&1
 df -k /usr/gapps/visit                             >> resultlog 2>&1
 echo ""                                            >> resultlog 2>&1
@@ -296,15 +286,15 @@ ls /usr/gapps/visit/$ver/sgi-irix6-mips2/plugins/databases/libI* | sed "s/\/usr\
 mail $emailName < resultlog
 EOF
 
-if [ $hyper = true ]
+if [ $quad = true ]
 then
    if [ $test = no ]
    then
-      scp hyper:/scratch1/$user/hyper/visitbuild/visit$ver2.irix6.tar.gz .
-      scp visit$ver2.irix6.tar.gz kickit:
-      scp visit-install kickit:
-      scp hyper kickit:hyper_install
-      ssh kickit "chmod 750 hyper_install;./hyper_install"
+      scp quad:/usr/tmp/$user/quad/visitbuild/visit$ver2.irix6.tar.gz .
+      scp visit$ver2.irix6.tar.gz gps15:
+      scp visit-install gps15:
+      scp quad gps15:quad_install
+      ssh gps15 "chmod 750 quad_install;./quad_install"
    fi
 fi
 
@@ -314,7 +304,7 @@ fi
 rm -f gps
 cat <<EOF > gps
 #!/bin/sh
-./visit-install -r -private -c open -g visit -gw -l $ver osf1 /usr/gapps/visit > installlog 2>&1
+./visit-install -private -c open -g visit -gw -l $ver osf1 /usr/gapps/visit > installlog 2>&1
 rm -f resultlog
 echo "        install of visit on gps"             > resultlog 2>&1
 echo "       -------------------------"            >> resultlog 2>&1
@@ -385,7 +375,7 @@ fi
 #
 rm -f up
 cat <<EOF > up
-
+#!/bin/sh
 ./visit-install -private -c open -g visit -gw -l $ver aix64-xlc /usr/gapps/visit > installlog 2>&1
 rm -f resultlog
 echo ""                                            >  resultlog 2>&1
@@ -418,15 +408,15 @@ then
 fi
 
 #
-# Install on pengra.
+# Install on mcr.
 #
-rm -f pengra
-cat <<EOF > pengra
+rm -f mcr
+cat <<EOF > mcr
 #!/bin/sh
-./visit-install $verflag -c open -g visit -gw -l $ver linux_chaos /usr/gapps/visit > installlog 2>&1
+./visit-install -private -c open -g visit -gw -l $ver linux_chaos /usr/gapps/visit > installlog 2>&1
 rm -f resultlog
-echo "        install of visit on pengra"          > resultlog 2>&1
-echo "       ----------------------------"         >> resultlog 2>&1
+echo "        install of visit on mcr"             > resultlog 2>&1
+echo "       -------------------------"            >> resultlog 2>&1
 echo ""                                            >> resultlog 2>&1
 df -k /usr/gapps/visit                             >> resultlog 2>&1
 echo ""                                            >> resultlog 2>&1
@@ -441,59 +431,22 @@ ls /usr/gapps/visit/$ver/linux-intel/plugins/databases/libI* | sed "s/\/usr\/gap
 mail $emailName < resultlog
 EOF
 
-if [ $pengra = true ]
+if [ $mcr = true ]
 then
    if [ $test = no ]
    then
-      scp pengra1:/usr/tmp/brugger/pengra/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_chaos.tar.gz
+      scp mcr37:/usr/tmp/brugger/mcr/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_chaos.tar.gz
       scp visit$ver2.linux_chaos.tar.gz gps15:
       scp visit-install gps15:
-      scp pengra gps15:pengra_install
-      ssh gps15 "chmod 750 pengra_install;./pengra_install"
-   fi
-fi
-
-#
-# Install on alc.
-#
-rm -f alc
-cat <<EOF > alc
-#!/bin/sh
-./visit-install -r -private -c open -g visit -gw -l $ver linux_chaos /usr/gapps/visit > installlog 2>&1
-rm -f resultlog
-echo "        install of visit on alc"             > resultlog 2>&1
-echo "       -------------------------"            >> resultlog 2>&1
-echo ""                                            >> resultlog 2>&1
-df -k /usr/gapps/visit                             >> resultlog 2>&1
-echo ""                                            >> resultlog 2>&1
-ls -l /usr/gapps/visit/$ver/linux-intel/bin        >> resultlog 2>&1
-echo ""                                            >> resultlog 2>&1
-echo "number of database plugins = "\`ls /usr/gapps/visit/$ver/linux-intel/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
-echo "number of operator plugins = "\`ls /usr/gapps/visit/$ver/linux-intel/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
-echo "number of plot plugins = "\`ls /usr/gapps/visit/$ver/linux-intel/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
-echo ""                                            >> resultlog 2>&1
-echo "The database plugins:"                       >> resultlog 2>&1
-ls /usr/gapps/visit/$ver/linux-intel/plugins/databases/libI* | sed "s/\/usr\/gapps\/visit\/$ver\/linux-intel\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
-mail $emailName < resultlog
-EOF
-
-if [ $alc = true ]
-then
-   if [ $test = no ]
-   then
-      scp pengra1:/usr/tmp/brugger/pengra/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_chaos.tar.gz
-      scp visit$ver2.linux_chaos.tar.gz alc0:
-      scp visit-install alc0:
-      scp alc alc0:alc_install
-      ssh alc0 "chmod 750 alc_install;./alc_install"
-      # Temporary until the gnu shared libraries are fixed on alc.  Copying
-      # the gcc 3.2.3 shared libraries to visit's shared library directory so
-      # that it gets them instead of the broken gnu 3.3.3 shared libraries.
-      scp pengra1:/usr/lib/libstdc++.so.5.0.3 .
-      scp pengra1:/lib/libgcc_s.so.1 .
+      scp mcr gsp15:mcr_install
+      ssh gps15 "chmod 750 mcr_install;./mcr_install"
+      # Temporary until all the machines are upgraded to chaos 3.  These
+      # libraries are needed to run chaos 2 executables on chaos 3 systems.
+      scp mcr37:/usr/lib/libstdc++.so.5.0.3 .
+      scp mcr37:/lib/libgcc_s.so.1 .
       chmod 664 libstdc++.so.5.0.3 libgcc_s.so.1
-      scp libstdc++.so.5.0.3 alc:/usr/gapps/visit/$ver/linux-intel/lib
-      scp libgcc_s.so.1 alc:/usr/gapps/visit/$ver/linux-intel/lib
+      scp libstdc++.so.5.0.3 gps15:/usr/gapps/visit/$ver/linux-intel/lib
+      scp libgcc_s.so.1 gps15:/usr/gapps/visit/$ver/linux-intel/lib
    fi
 fi
 
@@ -538,5 +491,5 @@ fi
 #
 if [ $test = no ]
 then
-   rm -f hoth sunspot hyper gps berg up pengra alc thunder
+   rm -f hoth sunspot quad gps berg up mcr thunder
 fi

cqscore/score.pl

@@ -559,7 +559,14 @@ while (($resultset->MoveNext()) == 1) {
   }
   else
   {
-      #next;
+      $li = substr($li_str, 0,1) if $li_str ne "";
+      $tc = substr($tc_str, 0,1) if $tc_str ne "";
+      $se = substr($se_str, 0,1) if $se_str ne "";
+      $iu = substr($iu_str, 0,1) if $iu_str ne "";
+      $id = substr($id_str, 0,1) if $id_str ne "";
+      $tg = substr($tg_str, 0,1) if $tg_str ne "";
+      $ef = substr($ef_str, 0,1) if $ef_str ne "";
+      $cp = substr($cp_str, 0,1) if $cp_str ne "";
   }
 
   if (! $debug and $output eq "")

engine/main/main.C

+#include <visit-config.h>
+
 #include <Engine.h>
 
 #include <DebugStream.h>

mdserver/main/main.C

+#include <visit-config.h>
+
 #include <VisItException.h>
 #include <MDServerApplication.h>
 #include <DebugStream.h>

viewer/main/Makefile.in

@@ -258,6 +258,9 @@
 #    Brad Whitlock, Mon May 2 10:39:56 PDT 2005
 #    Added support for multiple clients driving the viewer.
 #
+#    Eric Brugger, Wed Nov 23 08:00:06 PST 2005
+#    Added PLATFORM_CPPFLAGS.
+#
 ##############################################################################
 
 ##
@@ -285,7 +288,7 @@ LDFLAGS=@LDFLAGS@ @QT_LDFLAGS@
 LIBDEP=
 MOC=@QT_MOC@
 CXXFLAGS=@CXXFLAGS@ @QT_CXXFLAGS@ 
-CPPFLAGS=@CPPFLAGS@ $(VTK_INCLUDE) -I../../vtkqt \
+CPPFLAGS=@PLATFORM_CPPFLAGS@ @CPPFLAGS@ $(VTK_INCLUDE) -I../../vtkqt \
          -I./icons -I../../include -I../../include/visit -I.
 
 

viewer/main/viewer.C

@@ -2,6 +2,8 @@
 //                                 viewer.C                                  //
 // ************************************************************************* //
 
+#include <visit-config.h>
+
 #include <DebugStream.h>
 #include <ViewerSubject.h>
 #include <VisItException.h>

vtk/Common/CMakeLists.txt

@@ -273,7 +273,9 @@ IF (VTK_WRAP_TCL)
                 ${Kit_SRCS}
                 COMMANDS ${Kit_TCL_EXTRA_CMDS})
   ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
-#  TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
+  IF(APPLE OR WIN32)
+    TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
+  ENDIF(APPLE OR WIN32)
   INSTALL_TARGETS(/lib/vtk vtk${KIT}TCL)
 ENDIF (VTK_WRAP_TCL)
 
@@ -285,18 +287,20 @@ IF (VTK_WRAP_PYTHON)
   IF (APPLE)
     ADD_LIBRARY(vtk${KIT}PythonD ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
     ADD_LIBRARY(vtk${KIT}Python MODULE vtk${KIT}PythonInit.cxx)
-#    TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS} ${PYTHON_LIBRARY})
-#    TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
+    TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS} ${PYTHON_LIBRARY})
+    TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
     INSTALL_TARGETS(/lib/vtk vtk${KIT}PythonD)
   ELSE (APPLE)
     ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
-#    TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
+    IF(WIN32)
+      TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
+    ENDIF(WIN32)
   ENDIF(APPLE)
-#  IF(WIN32)
-#    TARGET_LINK_LIBRARIES (vtk${KIT}Python
-#                           debug ${PYTHON_DEBUG_LIBRARY}
-#                           optimized ${PYTHON_LIBRARY})
-#  ENDIF(WIN32)
+  IF(WIN32)
+    TARGET_LINK_LIBRARIES (vtk${KIT}Python
+                           debug ${PYTHON_DEBUG_LIBRARY}
+                           optimized ${PYTHON_LIBRARY})
+  ENDIF(WIN32)
   INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
 ENDIF (VTK_WRAP_PYTHON)
 
@@ -306,11 +310,15 @@ ENDIF (VTK_WRAP_PYTHON)
 IF (VTK_WRAP_JAVA)
   VTK_WRAP_JAVA2(vtk${KIT}Java KitJava_SRCS ${Kit_SRCS})
   ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
-#  TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
+  IF(APPLE OR WIN32)
+    TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
+  ENDIF(APPLE OR WIN32)
   INSTALL_TARGETS(/lib/vtk vtk${KIT}Java)
 ENDIF (VTK_WRAP_JAVA)
 
-#TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
+IF(APPLE OR WIN32)
+  TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
+ENDIF(APPLE OR WIN32)
 
 INSTALL_TARGETS(/lib/vtk vtk${KIT})
 INSTALL_FILES(/include/vtk .h ${Kit_SRCS})

vtk/Filtering/CMakeLists.txt

@@ -144,7 +144,9 @@ IF (VTK_WRAP_TCL)
                 ${Kit_SRCS}
                 COMMANDS ${Kit_TCL_EXTRA_CMDS})
   ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
-#  TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
+  IF(APPLE OR WIN32)
+    TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
+  ENDIF(APPLE OR WIN32)
   INSTALL_TARGETS(/lib/vtk vtk${KIT}TCL)
 ENDIF (VTK_WRAP_TCL)
 
@@ -156,18 +158,20 @@ IF (VTK_WRAP_PYTHON)
   IF (APPLE)
     ADD_LIBRARY(vtk${KIT}PythonD ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
     ADD_LIBRARY(vtk${KIT}Python MODULE vtk${KIT}PythonInit.cxx)
-#    TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS} ${PYTHON_LIBRARY})
-#    TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
+    TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS} ${PYTHON_LIBRARY})
+    TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
     INSTALL_TARGETS(/lib/vtk vtk${KIT}PythonD)
   ELSE (APPLE)
     ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
-#    TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
+    IF(WIN32)
+      TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
+    ENDIF(WIN32)
   ENDIF(APPLE)
-#  IF(WIN32)
-#    TARGET_LINK_LIBRARIES (vtk${KIT}Python
-#                           debug ${PYTHON_DEBUG_LIBRARY}
-#                           optimized ${PYTHON_LIBRARY})
-#  ENDIF(WIN32)
+  IF(WIN32)
+    TARGET_LINK_LIBRARIES (vtk${KIT}Python
+                           debug ${PYTHON_DEBUG_LIBRARY}
+                           optimized ${PYTHON_LIBRARY})
+  ENDIF(WIN32)
   INSTALL_TARGETS(/lib/vtk vtk${KIT}Python)
 ENDIF (VTK_WRAP_PYTHON)
 
@@ -177,11 +181,15 @@ ENDIF (VTK_WRAP_PYTHON)
 IF (VTK_WRAP_JAVA)
   VTK_WRAP_JAVA2(vtk${KIT}Java KitJava_SRCS ${Kit_SRCS})
   ADD_LIBRARY(vtk${KIT}Java SHARED ${KitJava_SRCS} ${Kit_JAVA_EXTRA_SRCS})
-#  TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
+  IF(APPLE OR WIN32)
+    TARGET_LINK_LIBRARIES(vtk${KIT}Java vtk${KIT} ${KIT_JAVA_LIBS})
+  ENDIF(APPLE OR WIN32)
   INSTALL_TARGETS(/lib/vtk vtk${KIT}Java)
 ENDIF (VTK_WRAP_JAVA)
 
-# TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
+IF(APPLE OR WIN32)
+  TARGET_LINK_LIBRARIES(vtk${KIT} ${KIT_LIBS})
+ENDIF(APPLE OR WIN32)
 
 INSTALL_TARGETS(/lib/vtk vtk${KIT})
 INSTALL_FILES(/include/vtk .h ${Kit_SRCS})

vtk/Graphics/CMakeLists.txt

@@ -210,7 +210,9 @@ IF (VTK_WRAP_TCL)
                 ${Kit_SRCS}
                 COMMANDS ${Kit_TCL_EXTRA_CMDS})
   ADD_LIBRARY(vtk${KIT}TCL ${KitTCL_SRCS} ${Kit_TCL_EXTRA_SRCS})
-#  TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
+  IF(APPLE OR WIN32)
+    TARGET_LINK_LIBRARIES (vtk${KIT}TCL vtk${KIT} ${KIT_TCL_LIBS})
+  ENDIF(APPLE OR WIN32)
   INSTALL_TARGETS(/lib/vtk vtk${KIT}TCL)
 ENDIF (VTK_WRAP_TCL)
 
@@ -222,18 +224,20 @@ IF (VTK_WRAP_PYTHON)
   IF (APPLE)
     ADD_LIBRARY(vtk${KIT}PythonD ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
     ADD_LIBRARY(vtk${KIT}Python MODULE vtk${KIT}PythonInit.cxx)
-#    TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS} ${PYTHON_LIBRARY})
-#    TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
+    TARGET_LINK_LIBRARIES(vtk${KIT}PythonD vtk${KIT} ${KIT_PYTHON_LIBS} ${PYTHON_LIBRARY})
+    TARGET_LINK_LIBRARIES(vtk${KIT}Python vtk${KIT}PythonD)
     INSTALL_TARGETS(/lib/vtk vtk${KIT}PythonD)
   ELSE (APPLE)
     ADD_LIBRARY(vtk${KIT}Python MODULE ${KitPython_SRCS} ${Kit_PYTHON_EXTRA_SRCS})
-#    TARGET_LINK_LIBRARIES (vtk${KIT}Python vtk${KIT} ${KIT_PYTHON_LIBS})
+    IF(WIN32)
+      TARGET_LINK_LIBRARIES (vtk${KIT