r36402 - in /packages/slicer/branch/experimental/debian: changelog control get-orig-source patches/50_all_changes.diff
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Mon Apr 19 11:21:43 UTC 2010
Author: domibel-guest
Date: Mon Apr 19 11:21:41 2010
New Revision: 36402
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36402
Log:
last snapshot with vtk-5.4
Modified:
packages/slicer/branch/experimental/debian/changelog
packages/slicer/branch/experimental/debian/control
packages/slicer/branch/experimental/debian/get-orig-source
packages/slicer/branch/experimental/debian/patches/50_all_changes.diff
Modified: packages/slicer/branch/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/changelog?rev=36402&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/changelog (original)
+++ packages/slicer/branch/experimental/debian/changelog Mon Apr 19 11:21:41 2010
@@ -1,4 +1,4 @@
-slicer (3.5.0~svn12296-1) unstable; urgency=low
+slicer (3.5.0~svn12531-1) experimental; urgency=low
* New snapshot
Modified: packages/slicer/branch/experimental/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/control?rev=36402&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/control (original)
+++ packages/slicer/branch/experimental/debian/control Mon Apr 19 11:21:41 2010
@@ -3,15 +3,15 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
-Build-Depends: debhelper (>= 7), quilt, cmake, tcl8.5-dev, tk8.5-dev, libpng-dev, libjpeg-dev,
+Build-Depends: debhelper (>= 7), quilt, cmake, tcl-dev, tk-dev, libpng-dev, libjpeg-dev,
libtiff-dev, libexpat1-dev, libinsighttoolkit3-dev, libkwwidgets1-dev, libcurl4-openssl-dev,
libfreetype6-dev, libxext-dev, libvtk5-dev (>= 5.2.0), libteem1-dev, libopenigtlink1-dev,
uuid-dev, libbz2-dev, libxft-dev, libtclap-dev, libgdcm2-dev, libfftw3-dev, libopenjpeg-dev,
libqt4-dev, libvtk5-qt4-dev, libmysqlclient-dev, libavcodec-dev, libavformat-dev, libswscale-dev,
- default-jdk, libgl2ps-dev, mpi-default-dev
+ default-jdk, libgl2ps-dev, mpi-default-dev, subversion, python-dev, python-vtk
Build-Depends-Indep: doxygen, graphviz
Build-Conflicts: libqt3-mt-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/slicer/trunk/
Section: graphics
Modified: packages/slicer/branch/experimental/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/get-orig-source?rev=36402&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/get-orig-source (original)
+++ packages/slicer/branch/experimental/debian/get-orig-source Mon Apr 19 11:21:41 2010
@@ -26,11 +26,11 @@
cd ${FOLDER}
#rm ./Utilities/Launcher/*.tcl
#rm ./Utilities/Launcher/CMakeLists.txt
-rm -rf ./Utilities/Launcher/Slicer3Launchers/
+rm -rf ./Utilities/Launcher/Slicer3Launchers/
rm -rf ./Utilities/Launcher/tclkits/
rm -rf ./Utilities/Launcher/Slicer3.vfs/
rm -f ./Utilities/Launcher/3DSlicerLogoICOimages/Thumbs.db
-rm -rf ./Libs/tclap/
+rm -rf ./Libs/SlicerExecutionModel/tclap/
#- find . -type f -name *.vcproj | xargs rm
rm -f ./Modules/QueryAtlas/Resources/controlledVocabulary.xls
#rm -f ./Modules/ChangeTracker/Testing/scan2.raw.gz
Modified: packages/slicer/branch/experimental/debian/patches/50_all_changes.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/patches/50_all_changes.diff?rev=36402&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/patches/50_all_changes.diff (original)
+++ packages/slicer/branch/experimental/debian/patches/50_all_changes.diff Mon Apr 19 11:21:41 2010
@@ -1,10 +1,10 @@
## This patch adds soname version numbers
## MRIBiasFieldCorrection is using code from review, cant compile it
-Index: slicer-3.5.0~svn12296/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-03-06 14:33:53.000000000 -0500
-+++ slicer-3.5.0~svn12296/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -18,8 +18,8 @@
#
@@ -25,10 +25,10 @@
#
# Generate executable
-Index: slicer-3.5.0~svn12296/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
-===================================================================
---- slicer-3.5.0~svn12296.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-03-06 14:33:53.000000000 -0500
-+++ slicer-3.5.0~svn12296/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-04-18 13:04:16.000000000 -0400
@@ -3,7 +3,7 @@
#endif
@@ -38,10 +38,10 @@
#include <itksys/SystemTools.hxx>
#include <itksys/Process.h>
#include <math.h>
-Index: slicer-3.5.0~svn12296/Applications/GUI/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Applications/GUI/CMakeLists.txt 2010-03-06 14:33:53.000000000 -0500
-+++ slicer-3.5.0~svn12296/Applications/GUI/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Applications/GUI/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Applications/GUI/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Applications/GUI/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -45,7 +45,7 @@
set(Slicer3_FORWARD_PATH_BUILD
"\"${Slicer3_FORWARD_DIR_BUILD}\",\"${VTK_DIR}/bin\",\"${KWWidgets_RUNTIME_DIRS}\",\"${ITK_DIR}/bin\",\"${Teem_DIR}/bin\",\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\",\"${OPENGL_gl_LIBRARY_PATH}\"")
@@ -64,10 +64,10 @@
# --------------------------------------------------------------------------
# Include dirs
-Index: slicer-3.5.0~svn12296/Applications/GUI/Slicer3.cxx
-===================================================================
---- slicer-3.5.0~svn12296.orig/Applications/GUI/Slicer3.cxx 2010-03-06 14:33:53.000000000 -0500
-+++ slicer-3.5.0~svn12296/Applications/GUI/Slicer3.cxx 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Applications/GUI/Slicer3.cxx
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Applications/GUI/Slicer3.cxx 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Applications/GUI/Slicer3.cxx 2010-04-18 13:04:16.000000000 -0400
@@ -447,7 +447,7 @@
}
@@ -77,22 +77,10 @@
vtkKWApplication::PutEnv(const_cast <char *> (tclEnv.c_str()));
// ITK factories dir
-Index: slicer-3.5.0~svn12296/Libs/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
-@@ -1,7 +1,6 @@
- project(SlicerLibs)
-
- set(dirs
-- tclap
- ModuleDescriptionParser
- GenerateCLP
- )
-Index: slicer-3.5.0~svn12296/Libs/FreeSurfer/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/FreeSurfer/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/FreeSurfer/CMakeLists.txt 2010-03-06 15:24:31.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/FreeSurfer/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/FreeSurfer/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/FreeSurfer/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -95,7 +95,7 @@
install(TARGETS ${lib_name}
@@ -121,48 +109,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.5.0~svn12296/Libs/GenerateCLP/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/GenerateCLP/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/GenerateCLP/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
-@@ -13,10 +13,10 @@
- include(${ModuleDescriptionParser_USE_FILE})
- endif(ModuleDescriptionParser_FOUND)
-
--find_package(TCLAP REQUIRED)
--if(TCLAP_FOUND)
-- include(${TCLAP_USE_FILE})
--endif(TCLAP_FOUND)
-+#find_package(TCLAP REQUIRED)
-+#if(TCLAP_FOUND)
-+# include(${TCLAP_USE_FILE})
-+#endif(TCLAP_FOUND)
-
- find_package(ITK REQUIRED)
- if(ITK_FOUND)
-Index: slicer-3.5.0~svn12296/Libs/GenerateCLP/UseGenerateCLP.cmake.in
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/GenerateCLP/UseGenerateCLP.cmake.in 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/GenerateCLP/UseGenerateCLP.cmake.in 2010-03-06 14:34:22.000000000 -0500
-@@ -5,10 +5,10 @@
- message(FATAL_ERROR "Cannot build without ITK. Please set ITK_DIR.")
- endif(ITK_FOUND)
-
--find_package(TCLAP REQUIRED)
--if(TCLAP_FOUND)
-- include(${TCLAP_USE_FILE})
--endif(TCLAP_FOUND)
-+#find_package(TCLAP REQUIRED)
-+#if(TCLAP_FOUND)
-+# include(${TCLAP_USE_FILE})
-+#endif(TCLAP_FOUND)
-
- find_package(ModuleDescriptionParser REQUIRED)
- if(ModuleDescriptionParser_FOUND)
-Index: slicer-3.5.0~svn12296/Libs/IGT/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/IGT/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/IGT/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/IGT/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/IGT/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/IGT/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -157,7 +157,7 @@
install(TARGETS ${lib_name}
@@ -172,10 +122,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Libs/ITKCommandIO/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/ITKCommandIO/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/ITKCommandIO/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/ITKCommandIO/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/ITKCommandIO/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/ITKCommandIO/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -75,7 +75,7 @@
install(TARGETS ${lib_name}
@@ -185,10 +135,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Libs/LoadableModule/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/LoadableModule/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/LoadableModule/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/LoadableModule/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/LoadableModule/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/LoadableModule/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -127,7 +127,7 @@
install(TARGETS ${lib_name}
@@ -198,10 +148,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Libs/MGHImageIO/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/MGHImageIO/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/MGHImageIO/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/MGHImageIO/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/MGHImageIO/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/MGHImageIO/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -63,7 +63,7 @@
install(TARGETS ${lib_name}
@@ -211,10 +161,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Libs/MRML/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/MRML/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/MRML/CMakeLists.txt 2010-03-06 15:31:09.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/MRML/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/MRML/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/MRML/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -267,7 +267,7 @@
install(TARGETS ${lib_name}
@@ -242,10 +192,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.5.0~svn12296/Libs/MRMLIDImageIO/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/MRMLIDImageIO/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/MRMLIDImageIO/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/MRMLIDImageIO/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/MRMLIDImageIO/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/MRMLIDImageIO/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -85,7 +85,7 @@
install(TARGETS ${lib_name}
@@ -255,23 +205,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Libs/ModuleDescriptionParser/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/ModuleDescriptionParser/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/ModuleDescriptionParser/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
-@@ -132,7 +132,7 @@
-
- install(TARGETS ${lib_name}
- RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
-- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
-+ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
- ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
- )
-
-Index: slicer-3.5.0~svn12296/Libs/Qdec/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/Qdec/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/Qdec/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/Qdec/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/Qdec/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/Qdec/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -87,7 +87,7 @@
install(TARGETS ${lib_name}
@@ -281,10 +218,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Libs/RemoteIO/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/RemoteIO/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/RemoteIO/CMakeLists.txt 2010-03-06 15:33:39.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/RemoteIO/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/RemoteIO/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/RemoteIO/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -13,8 +13,11 @@
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
@@ -336,10 +273,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.5.0~svn12296/Libs/RemoteIO/vtkHTTPHandler.h
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/RemoteIO/vtkHTTPHandler.h 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/RemoteIO/vtkHTTPHandler.h 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/RemoteIO/vtkHTTPHandler.h
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/RemoteIO/vtkHTTPHandler.h 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/RemoteIO/vtkHTTPHandler.h 2010-04-18 13:04:16.000000000 -0400
@@ -5,7 +5,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -349,10 +286,10 @@
#include <vtkRemoteIOConfigure.h>
#include "vtkRemoteIO.h"
-Index: slicer-3.5.0~svn12296/Libs/SlicerIO/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/SlicerIO/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/SlicerIO/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/SlicerIO/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/SlicerIO/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/SlicerIO/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -50,7 +50,7 @@
install(TARGETS ${lib_name}
@@ -362,10 +299,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Libs/vtkITK/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/vtkITK/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/vtkITK/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/vtkITK/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/vtkITK/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/vtkITK/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -151,7 +151,7 @@
install(TARGETS ${lib_name}
@@ -375,10 +312,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Libs/vtkTeem/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/vtkTeem/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/vtkTeem/CMakeLists.txt 2010-03-06 15:44:47.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/vtkTeem/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/vtkTeem/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/vtkTeem/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -136,7 +136,7 @@
install(TARGETS ${lib_name}
@@ -406,41 +343,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.5.0~svn12296/Modules/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/CMakeLists.txt 2010-03-06 14:33:53.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
-@@ -61,7 +61,7 @@
- Tractography
- # TumorGrowth
- Volumes
-- ChangeTracker # AF: refactoring TumorGrowth...
-+# ChangeTracker # AF: refactoring TumorGrowth...
- VolumeRendering
- # VolumeRendering1 <- merged into VolumeRendering
- # WFEngineModule <- can't work with 2.6 and Win32??
-@@ -78,7 +78,7 @@
- # FourDAnalysis
- ExtractSubvolumeROI
- CollectFiducials
-- PETCTFusion
-+# PETCTFusion
- )
-
- if(Slicer3_USE_OPENIGTLINK)
-@@ -86,7 +86,7 @@
- ${modules}
- OpenIGTLinkIF
- NeuroNav
-- ProstateNav
-+# ProstateNav
- # IGTNavigation
- # OpenCV
- )
-Index: slicer-3.5.0~svn12296/Modules/ChangeTracker/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/ChangeTracker/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/ChangeTracker/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/ChangeTracker/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/ChangeTracker/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/ChangeTracker/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -44,8 +44,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -450,10 +356,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/CommandLineModule/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/CommandLineModule/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/CommandLineModule/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/CommandLineModule/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/CommandLineModule/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/CommandLineModule/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -463,10 +369,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/FetchMI/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/FetchMI/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/FetchMI/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/FetchMI/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/FetchMI/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/FetchMI/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -44,8 +44,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -476,10 +382,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -41,8 +41,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -489,10 +395,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/Meshing/IA_FEMesh/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/Meshing/IA_FEMesh/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -46,8 +46,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -502,10 +408,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/NeuroNav/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/NeuroNav/CMakeLists.txt 2010-03-06 14:33:53.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/NeuroNav/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/NeuroNav/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/NeuroNav/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/NeuroNav/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -42,8 +42,6 @@
"${CMAKE_CURRENT_SOURCE_DIR}/*.h"
)
@@ -515,10 +421,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/OpenIGTLinkIF/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/OpenIGTLinkIF/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -42,8 +42,6 @@
)
@@ -528,64 +434,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/ProstateNav/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/ProstateNav/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/ProstateNav/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
-@@ -19,12 +19,16 @@
-
- # --------------------------------------------------------------------------
- # Include dirs
-+#find_package(OpenIGTLink REQUIRED)
-+#include_directories(${OpenIGTLink_INCLUDE_DIRS})
-
-
- #
- # Include dirs
- #
-
-+include_directories( /usr/include/newmat )
-+
-
- include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -91,32 +95,9 @@
- ${CMAKE_CURRENT_SOURCE_DIR}/igtlHeaderMessage.cxx
- ${CMAKE_CURRENT_SOURCE_DIR}/igtlMoveToMessage.cxx
- ${CMAKE_CURRENT_SOURCE_DIR}/igtlSetZFrameMessage.cxx
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat9.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmatrm.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/nm_misc.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/bandmat.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat1.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/solution.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/cholesky.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/hholder.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat2.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmatex.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat3.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/sort.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/evalue.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/jacobi.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat4.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/submat.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/example.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat5.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/svd.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/myexcept.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat6.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmatnl.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/fft.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat7.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newfft.cpp
-- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/newmat8.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/newmat/ZLinAlg.cxx
- )
-
-Index: slicer-3.5.0~svn12296/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-04-18 13:04:16.000000000 -0400
@@ -28,6 +28,13 @@
class VTK_PROSTATENAV_EXPORT vtkProstateNavCalibrationStep : public vtkProstateNavStep
{
@@ -600,10 +452,10 @@
static vtkProstateNavCalibrationStep *New();
vtkTypeRevisionMacro(vtkProstateNavCalibrationStep,vtkProstateNavStep);
void PrintSelf(ostream& os, vtkIndent indent);
-Index: slicer-3.5.0~svn12296/Modules/QdecModule/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/QdecModule/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/QdecModule/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/QdecModule/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/QdecModule/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/QdecModule/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -621,10 +473,10 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-Index: slicer-3.5.0~svn12296/Modules/QueryAtlas/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/QueryAtlas/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/QueryAtlas/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/QueryAtlas/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/QueryAtlas/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/QueryAtlas/CMakeLists.txt 2010-04-18 13:06:42.000000000 -0400
@@ -44,14 +44,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -661,15 +513,15 @@
+# ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${file}
+# COPYONLY)
+# get_filename_component(path "${file}" PATH)
-+# install(FILES
-+# ${file}
++# install(FILES
++# ${file}
+# DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${path} COMPONENT Development
-+# )
++# )
+#endforeach(file)
-Index: slicer-3.5.0~svn12296/Modules/RealTimeImaging/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/RealTimeImaging/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/RealTimeImaging/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/RealTimeImaging/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/RealTimeImaging/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/RealTimeImaging/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -34,7 +34,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -678,10 +530,10 @@
"${CMAKE_CURRENT_BINARY_DIR}/vtkRealTimeImagingConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/ScriptedModule/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/ScriptedModule/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/ScriptedModule/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/ScriptedModule/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/ScriptedModule/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/ScriptedModule/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -699,10 +551,10 @@
# Python settings
if(Slicer3_USE_PYTHON)
-Index: slicer-3.5.0~svn12296/Modules/SlicerDaemon/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/SlicerDaemon/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/SlicerDaemon/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/SlicerDaemon/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/SlicerDaemon/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/SlicerDaemon/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -720,10 +572,10 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-Index: slicer-3.5.0~svn12296/Modules/SlicerWelcome/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/SlicerWelcome/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/SlicerWelcome/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/SlicerWelcome/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/SlicerWelcome/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/SlicerWelcome/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -39,8 +39,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -733,10 +585,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/Statistics/LabelStatistics/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/Statistics/LabelStatistics/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -746,10 +598,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/Tractography/Display/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/Tractography/Display/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/Tractography/Display/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/Tractography/Display/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/Tractography/Display/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/Tractography/Display/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -33,14 +33,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -765,10 +617,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/Tractography/FiducialSeeding/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/Tractography/FiducialSeeding/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -35,8 +35,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -786,10 +638,10 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-Index: slicer-3.5.0~svn12296/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -799,10 +651,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Modules/Volumes/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/Volumes/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/Volumes/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/Volumes/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/Volumes/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/Volumes/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -48,7 +48,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -811,10 +663,10 @@
"${CMAKE_CURRENT_BINARY_DIR}/vtkVolumesConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Scripts/versioner.tcl
-===================================================================
---- slicer-3.5.0~svn12296.orig/Scripts/versioner.tcl 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Scripts/versioner.tcl 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Scripts/versioner.tcl
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Scripts/versioner.tcl 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Scripts/versioner.tcl 2010-04-18 13:04:16.000000000 -0400
@@ -14,15 +14,6 @@
# Initiated - sp - 2009-03-24
#
@@ -868,10 +720,10 @@
set versionFile $::Slicer3_BUILD/lib/Slicer3/Slicer3Version.txt
puts "Writing version information to $versionFile"
-Index: slicer-3.5.0~svn12296/Applications/CLI/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Applications/CLI/CMakeLists.txt 2010-03-06 14:33:53.000000000 -0500
-+++ slicer-3.5.0~svn12296/Applications/CLI/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Applications/CLI/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Applications/CLI/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Applications/CLI/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -309,7 +309,7 @@
slicer3_set_plugins_output_path(${CLP})
target_link_libraries (${CLP} ${CLP}Lib)
@@ -881,16 +733,16 @@
#####################
# set (CLP DWIDicomLoad)
-@@ -652,7 +652,7 @@
- ###################
-
+@@ -665,7 +665,7 @@
+
+ ##BRAINSDemonWarp
SET(cli_modules
- MRIBiasFieldCorrection
+# MRIBiasFieldCorrection
SparseFieldLevelSetContour
Realign
DiffusionApplications
-@@ -667,11 +667,11 @@
+@@ -680,11 +680,11 @@
else ( ${ITK_VERSION_MAJOR} GREATER 3 )
@@ -904,7 +756,7 @@
if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
if ( ITK_USE_OPTIMIZED_REGISTRATION_METHODS )
-@@ -683,7 +683,7 @@
+@@ -696,7 +696,7 @@
message ("RegisterImagesModule requires ITK version 3.8 or higher")
endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
@@ -913,10 +765,10 @@
endif ( ${ITK_VERSION_MAJOR} GREATER 3 )
-Index: slicer-3.5.0~svn12296/Modules/Meshing/Filter/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/Meshing/Filter/CMakeLists.txt 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/Meshing/Filter/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/Meshing/Filter/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/Meshing/Filter/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/Meshing/Filter/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -95,6 +95,13 @@
mimxCommon
)
@@ -931,10 +783,10 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-Index: slicer-3.5.0~svn12296/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/CMakeLists.txt 2010-03-06 14:33:53.000000000 -0500
-+++ slicer-3.5.0~svn12296/CMakeLists.txt 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -29,6 +29,11 @@
set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
@@ -972,10 +824,10 @@
endif(Slicer3_USE_OPENIGTLINK)
#-----------------------------------------------------------------------------
-Index: slicer-3.5.0~svn12296/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-04-18 13:04:16.000000000 -0400
@@ -34,7 +34,7 @@
#include <string>
@@ -985,10 +837,10 @@
#include "gdcmDict.h" /// access to dictionary
#include "gdcmDictEntry.h" /// access to dictionary
#include "gdcmGlobal.h" /// access to dictionary
-Index: slicer-3.5.0~svn12296/Libs/MRML/vtkMRMLCameraNode.cxx
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/MRML/vtkMRMLCameraNode.cxx 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/MRML/vtkMRMLCameraNode.cxx 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/MRML/vtkMRMLCameraNode.cxx
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/MRML/vtkMRMLCameraNode.cxx 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/MRML/vtkMRMLCameraNode.cxx 2010-04-18 13:04:16.000000000 -0400
@@ -76,7 +76,11 @@
{
if (this->Camera)
@@ -1024,10 +876,10 @@
user_transform->Delete();
}
vtkMatrix4x4* transformToWorld = vtkMatrix4x4::New();
-Index: slicer-3.5.0~svn12296/Modules/PETCTFusion/vtkPETCTFusionLogic.cxx
-===================================================================
---- slicer-3.5.0~svn12296.orig/Modules/PETCTFusion/vtkPETCTFusionLogic.cxx 2010-03-06 14:33:54.000000000 -0500
-+++ slicer-3.5.0~svn12296/Modules/PETCTFusion/vtkPETCTFusionLogic.cxx 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/Modules/PETCTFusion/vtkPETCTFusionLogic.cxx
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/PETCTFusion/vtkPETCTFusionLogic.cxx 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/PETCTFusion/vtkPETCTFusionLogic.cxx 2010-04-18 13:04:16.000000000 -0400
@@ -25,8 +25,8 @@
#include "itkImageSeriesReader.h"
#include "vtkGlobFileNames.h"
@@ -1039,10 +891,10 @@
#include "vtkPETCTFusionLogic.h"
#include "vtkPETCTFusion.h"
-Index: slicer-3.5.0~svn12296/CMake/Slicer3FindQT.cmake
-===================================================================
---- slicer-3.5.0~svn12296.orig/CMake/Slicer3FindQT.cmake 2010-03-06 14:33:53.000000000 -0500
-+++ slicer-3.5.0~svn12296/CMake/Slicer3FindQT.cmake 2010-03-06 14:34:22.000000000 -0500
+Index: slicer-3.5.0~svn12531/CMake/Slicer3FindQT.cmake
+===================================================================
+--- slicer-3.5.0~svn12531.orig/CMake/Slicer3FindQT.cmake 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/CMake/Slicer3FindQT.cmake 2010-04-18 13:04:16.000000000 -0400
@@ -9,37 +9,37 @@
IF(Slicer3_USE_QT)
@@ -1096,10 +948,10 @@
ENDIF(Slicer3_USE_QT)
ENDMACRO(Slicer3_SETUP_QT)
-Index: slicer-3.5.0~svn12296/Libs/MRMLCLI/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Libs/MRMLCLI/CMakeLists.txt 2010-03-06 15:45:04.000000000 -0500
-+++ slicer-3.5.0~svn12296/Libs/MRMLCLI/CMakeLists.txt 2010-03-06 15:45:42.000000000 -0500
+Index: slicer-3.5.0~svn12531/Libs/MRMLCLI/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/MRMLCLI/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/MRMLCLI/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -103,7 +103,7 @@
INSTALL(TARGETS ${lib_name}
@@ -1109,10 +961,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.5.0~svn12296/Utilities/Launcher/CMakeLists.txt
-===================================================================
---- slicer-3.5.0~svn12296.orig/Utilities/Launcher/CMakeLists.txt 2010-03-06 16:06:46.000000000 -0500
-+++ slicer-3.5.0~svn12296/Utilities/Launcher/CMakeLists.txt 2010-03-06 16:08:31.000000000 -0500
+Index: slicer-3.5.0~svn12531/Utilities/Launcher/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Utilities/Launcher/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Utilities/Launcher/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
@@ -39,7 +39,7 @@
"${CMAKE_CURRENT_SOURCE_DIR}/Slicer3Launchers/${launcher_name}")
@@ -1131,3 +983,100 @@
endif(EXISTS "${launcher_source}")
# Should this location change, change Application/GUI/Slicer3.cxx as well
+Index: slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+@@ -13,10 +13,10 @@
+ include(${ModuleDescriptionParser_USE_FILE})
+ endif(ModuleDescriptionParser_FOUND)
+
+-find_package(TCLAP REQUIRED)
+-if(TCLAP_FOUND)
+- include(${TCLAP_USE_FILE})
+-endif(TCLAP_FOUND)
++#find_package(TCLAP REQUIRED)
++#if(TCLAP_FOUND)
++# include(${TCLAP_USE_FILE})
++#endif(TCLAP_FOUND)
+
+ find_package(ITK REQUIRED)
+ if(ITK_FOUND)
+Index: slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-04-18 13:04:16.000000000 -0400
+@@ -5,10 +5,10 @@
+ message(FATAL_ERROR "Cannot build without ITK. Please set ITK_DIR.")
+ endif(ITK_FOUND)
+
+-find_package(TCLAP REQUIRED)
+-if(TCLAP_FOUND)
+- include(${TCLAP_USE_FILE})
+-endif(TCLAP_FOUND)
++#find_package(TCLAP REQUIRED)
++#if(TCLAP_FOUND)
++# include(${TCLAP_USE_FILE})
++#endif(TCLAP_FOUND)
+
+ find_package(ModuleDescriptionParser REQUIRED)
+ if(ModuleDescriptionParser_FOUND)
+Index: slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+@@ -132,7 +132,7 @@
+
+ install(TARGETS ${lib_name}
+ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
+- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
+ )
+
+Index: slicer-3.5.0~svn12531/Modules/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Modules/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Modules/CMakeLists.txt 2010-04-18 13:06:01.000000000 -0400
+@@ -61,7 +61,7 @@
+ Tractography
+ # TumorGrowth
+ Volumes
+- ChangeTracker # AF: refactoring TumorGrowth...
++# ChangeTracker # AF: refactoring TumorGrowth...
+ VolumeRendering
+ # VolumeRendering1 <- merged into VolumeRendering
+ # WFEngineModule <- can't work with 2.6 and Win32??
+@@ -79,7 +79,7 @@
+ # ExtractSubvolumeROI <- renamed to CropVolume
+ CropVolume
+ CollectFiducials
+- PETCTFusion
++# PETCTFusion
+ IGTToolSelector
+ )
+
+@@ -88,7 +88,7 @@
+ ${modules}
+ OpenIGTLinkIF
+ NeuroNav
+- ProstateNav
++# ProstateNav
+ # IGTNavigation
+ # OpenCV
+ )
+Index: slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/CMakeLists.txt
+===================================================================
+--- slicer-3.5.0~svn12531.orig/Libs/SlicerExecutionModel/CMakeLists.txt 2010-04-18 08:32:28.000000000 -0400
++++ slicer-3.5.0~svn12531/Libs/SlicerExecutionModel/CMakeLists.txt 2010-04-18 13:04:16.000000000 -0400
+@@ -30,8 +30,8 @@
+ ###
+
+
+-SETIFEMPTY(TCLAP_DIR ${CMAKE_CURRENT_BINARY_DIR}/tclap CACHE PATH "Location of TCLAPConfig.cmake" FORCE)
+-ADD_SUBDIRECTORY(tclap)
++#SETIFEMPTY(TCLAP_DIR ${CMAKE_CURRENT_BINARY_DIR}/tclap CACHE PATH "Location of TCLAPConfig.cmake" FORCE)
++#ADD_SUBDIRECTORY(tclap)
+
+ SETIFEMPTY(ModuleDescriptionParser_DIR ${CMAKE_CURRENT_BINARY_DIR}/ModuleDescriptionParser CACHE PATH "Location of ModuleDescriptionParserConfig.cmake" FORCE)
+ ADD_SUBDIRECTORY(ModuleDescriptionParser)
More information about the debian-science-commits
mailing list