STYLE: cleanup itcl_configure_step.cmake.in

git-svn-id: http://svn.slicer.org/Slicer4/trunk@13341 3bd1e089-480b-0410-8dfb-8563597acbee

SuperBuild/CMakeLists.txt

@@ -269,7 +269,7 @@ set(slicer_QT_ARGS)
 if(Slicer3_USE_QT)
   set(slicer_QT_ARGS
     -DQT_QMAKE_EXECUTABLE:PATH=${QT_QMAKE_EXECUTABLE}
-    -DCTK_DIR:PATH=${CMAKE_BINARY_DIR}/CTK-build
+    -DCTK_DIR:PATH=${CMAKE_BINARY_DIR}/CTK-build/CTK-build
     )
   list(APPEND slicer_DEPENDENCIES CTK)
 endif(Slicer3_USE_QT)

SuperBuild/External_VTK.cmake

@@ -87,6 +87,7 @@ ExternalProject_Add(vtk
     -DVTK_USE_PARALLEL:BOOL=ON
     -DVTK_DEBUG_LEAKS:BOOL=${Slicer3_USE_VTK_DEBUG_LEAKS}
     -DVTK_WRAP_TCL:BOOL=${vtk_WRAP_TCL}
+    -DVTK_USE_RPATH:BOOL=ON
     ${vtk_TCL_ARGS}
     -DVTK_WRAP_PYTHON:BOOL=${vtk_WRAP_PYTHON}
     ${vtk_PYTHON_ARGS}

SuperBuild/itcl_configure_step.cmake.in

 
-#set(ENV{PATH} "${CMAKE_BINARY_DIR}/python-build/lib")
-#set(ENV{PATH} "@tcl_build@../tcl/bin:$ENV{PATH}")
-#set(ENV{DYLD_LIBRARY_PATH} "/usr/X11/lib:$ENV{DYLD_LIBRARY_PATH}")
-
-
-#exec cp ../incrTcl/itcl/configure ../incrTcl/itcl/configure.orig
-#exec sed -e "s/\\*\\.c | \\*\\.o | \\*\\.obj) ;;/\\*\\.c | \\*\\.o | \\*\\.obj | \\*\\.dSYM | \\*\\.gnoc ) ;;/" ../incrTcl/itcl/configure.orig > ../incrTcl/itcl/configure 
-
 execute_process(
   COMMAND ${CMAKE_COMMAND} -E copy configure configure.orig
   WORKING_DIRECTORY @tcl_base@/incrTcl/itcl
@@ -27,12 +19,3 @@ execute_process(
   COMMAND ${CMAKE_COMMAND} -E copy configure.orig configure
   WORKING_DIRECTORY @tcl_base@/incrTcl/itcl
 )
-
-
-# catch "eval runcmd $::MAKE all"
-#        if { [file exists ../incrTcl/itcl/libitclstub3.2.a] } {
-#          runcmd ranlib ../incrTcl/itcl/libitclstub3.2.a
-#        }  
-#message("LD_LIBRARY_PATH:=ENV{LD_LIBRARY_PATH}")
-#set(et(tk_CVS_REPOSITORY :pserver:anonymous@tktoolkit.cvs.sourceforge.net:/cvsroot/tktoolkit)
-