r37380 - in /packages/slicer/trunk/debian: README.Debian README.source changelog control copyright dirs get-orig-source libslicer3.lintian-overrides patches/20_svn.diff patches/50_all_changes.diff patches/series rules slicer.install
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Sat Feb 19 23:01:08 UTC 2011
Author: domibel-guest
Date: Sat Feb 19 23:01:00 2011
New Revision: 37380
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37380
Log:
Debian release slicer 3.6.2~svn15699-1
Removed:
packages/slicer/trunk/debian/dirs
packages/slicer/trunk/debian/patches/20_svn.diff
Modified:
packages/slicer/trunk/debian/README.Debian
packages/slicer/trunk/debian/README.source
packages/slicer/trunk/debian/changelog
packages/slicer/trunk/debian/control
packages/slicer/trunk/debian/copyright
packages/slicer/trunk/debian/get-orig-source
packages/slicer/trunk/debian/libslicer3.lintian-overrides
packages/slicer/trunk/debian/patches/50_all_changes.diff
packages/slicer/trunk/debian/patches/series
packages/slicer/trunk/debian/rules
packages/slicer/trunk/debian/slicer.install
Modified: packages/slicer/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/README.Debian?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/README.Debian (original)
+++ packages/slicer/trunk/debian/README.Debian Sat Feb 19 23:01:00 2011
@@ -3,9 +3,4 @@
This package does not use slicerlibcurl. Instead it uses curl from the Debian repositories.
-
-MRML stands for Medical Reality Modeling Language and has nothing to do with
-the libmrml1-dev package which is used for the Multimedia Retrieval Markup Language.
-
-
- -- Dominique Belhachemi <domibel at debian.org> Sat, 22 Mar 2008 10:08:42 +0000
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 22 Mar 2008 10:08:42 +0000
Modified: packages/slicer/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/README.source?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/README.source (original)
+++ packages/slicer/trunk/debian/README.source Sat Feb 19 23:01:00 2011
@@ -1,16 +1,3 @@
-1)
-I removed some precompiled files which are used to launch Slicer in non-standard environments.
-
Please read
- debian/get-orig-source
+/usr/share/doc/quilt/README.source
for more information.
-
-2)
-I am using quilt to add SONAME information to the libraries.
-
-Please read
- /usr/share/doc/quilt/README.source
-for more information.
-
-
--Dominique
Modified: packages/slicer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/changelog?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/changelog (original)
+++ packages/slicer/trunk/debian/changelog Sat Feb 19 23:01:00 2011
@@ -1,67 +1,43 @@
-slicer (3.4.0~svn10438-7) unstable; urgency=low
+slicer (3.6.2~svn15699-1) experimental; urgency=low
- * Fixed FTBFS with ITK 3.18 (Closes: #583001)
+ * New snapshot
+ * Built against libkwwidgets1-dev (>=1.0.0~cvs20100930) (Closes: #601306)
+ * Removed /usr/lib/InsightToolkit from Slicer3_FORWARD_PATH_INSTALL (Closes: #591339)
+
+ -- Dominique Belhachemi <domibel at debian.org> Sat, 26 Dec 2010 19:05:18 -0500
+
+slicer (3.6.2~svn15375-1) experimental; urgency=low
+
+ * New snapshot
+ * Bump Standards-Version: 3.9.1 (no changes necessary)
+
+ -- Dominique Belhachemi <domibel at debian.org> Sat, 30 Oct 2010 20:39:41 -0400
+
+slicer (3.6.2~svn15316-1) experimental; urgency=low
+
+ * new patch release candiate
+
+ -- Dominique Belhachemi <domibel at debian.org> Tue, 31 Aug 2010 21:24:53 -0400
+
+slicer (3.6.0~svn14326-1) experimental; urgency=low
+
+ * new snapshot
+
+ -- Dominique Belhachemi <domibel at debian.org> Wed, 28 Jul 2010 22:10:40 -0400
+
+slicer (3.6.0~svn13936-2) experimental; urgency=low
+
+ * dependencies
+ * Standards-Version: 3.9.0
+
+ -- Dominique Belhachemi <domibel at debian.org> Thu, 15 Jul 2010 15:56:10 -0400
+
+slicer (3.6.0~svn13936-1) experimental; urgency=low
+
+ * New upstream release
* Switch to dpkg-source 3.0 (quilt) format
- -- Dominique Belhachemi <domibel at debian.org> Tue, 08 Jun 2010 16:36:18 -0400
-
-slicer (3.4.0~svn10438-6) unstable; urgency=low
-
- * Upstream patches until svn revision 12406 included
- * gdcm.dic added
- * private .so files moved from libslicer3-dev to slicer
-
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sun, 21 Mar 2010 12:38:29 -0400
-
-slicer (3.4.0~svn10438-5) unstable; urgency=low
-
- * added patch for compiling with vtk 5.4 (Closes: #567692)
- * BIFF_STRLEN definition for vtkTeem added
- * Bump standard version to 3.8.4
-
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Mon, 01 Feb 2010 21:46:02 -0500
-
-slicer (3.4.0~svn10438-4) unstable; urgency=low
-
- * Add build deps: libmysqlclient-dev, libgl2ps-dev, libavcodec-dev, libpq-dev,
- libswscale-dev, default-jdk, mpi-default-dev, libavformat-dev
- (Closes: #562351)
- * Fixed strrchr/<cstring> issue
-
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Wed, 06 Jan 2010 22:06:38 -0500
-
-slicer (3.4.0~svn10438-3) unstable; urgency=low
-
- * Keep RegisterImages deactivated
- * skipping itkConceptChecking (Closes: #549790)
-
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Mon, 28 Sep 2009 20:57:12 -0400
-
-slicer (3.4.0~svn10438-2) unstable; urgency=low
-
- * debian/control: Conflicts entry added (Closes: #547505)
- libslicer3-dev conflicts with libmrml1-dev now
- * Using CMake's include_directories instead of include
- to fix a build error on kFreeBSD
- * quilt patch file added to cherry pick upstream's SVN changes
-
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Mon, 21 Sep 2009 14:16:02 -0400
-
-slicer (3.4.0~svn10438-1) unstable; urgency=low
-
- * switch to Tcl/Tk 8.5
- * change patch system to quilt
- * move some runtime files to libslicer3 (Closes: #541890)
- * Bump standard version to 3.8.3
-
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sun, 13 Sep 2009 15:23:19 -0400
-
-slicer (3.4.0~svn10317-1) experimental; urgency=low
-
- * Launcher added: /usr/bin/Slicer-launcher
- * Installing Slicer3Version.txt
-
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Tue, 20 Aug 2009 15:32:25 -0400
+ -- Dominique Belhachemi <domibel at debian.org> Tue, 20 Apr 2010 02:20:49 -4000
slicer (3.4.0~svn10133-1) experimental; urgency=low
Modified: packages/slicer/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/control?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/control (original)
+++ packages/slicer/trunk/debian/control Sat Feb 19 23:01:00 2011
@@ -3,13 +3,14 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Dominique Belhachemi <domibel at debian.org>
-Build-Depends: debhelper (>= 7), quilt, cmake, tcl8.5-dev, tk8.5-dev, libexpat1-dev,
- libinsighttoolkit3-dev (>= 3.16), libkwwidgets1-dev,
- libvtk5-dev (>= 5.2.1-11), libteem1-dev, libopenigtlink1-dev,
- libbz2-dev, libxft-dev, libtclap-dev, libgdcm2-dev, libfftw3-dev,
- libcurl4-openssl-dev, libopenjpeg-dev, uuid-dev
+Build-Depends: debhelper (>= 7), quilt, cmake, tcl-dev, tk-dev,
+ libinsighttoolkit3-dev, libkwwidgets1-dev (>=1.0.0~cvs20100930),
+ libcurl4-openssl-dev, libvtk5-dev (>= 5.6), libteem1-dev, libopenigtlink1-dev,
+ libbz2-dev, libtclap-dev, libgdcm2-dev, python-dev, python-vtk, subversion, libfftw3-dev,
+ libpq-dev, libmysqlclient-dev, mpi-default-dev, libqt4-dev
Build-Depends-Indep: doxygen, graphviz
-Standards-Version: 3.8.4
+Build-Conflicts: libqt3-mt-dev
+Standards-Version: 3.9.1
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
@@ -19,7 +20,7 @@
Package: slicer
Architecture: any
Depends: libslicer3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
- slicer-data, itcl3, iwidgets4, tcllib, tcl8.5-kwwidgets
+ slicer-data, itcl3, iwidgets4, tcllib, tcl8.5-kwwidgets, python-numpy
Description: software package for visualization and image analysis - main application
Slicer is an application for computer scientists and clinical researchers. The
platform provides functionality for segmentation, registration and
@@ -52,7 +53,6 @@
Section: libdevel
Architecture: any
Depends: libslicer3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmrml1-dev
Description: software package for visualization and image analysis - development
Slicer is an application for computer scientists and clinical researchers. The
platform provides functionality for segmentation, registration and
Modified: packages/slicer/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/copyright?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/copyright (original)
+++ packages/slicer/trunk/debian/copyright Sat Feb 19 23:01:00 2011
@@ -596,14 +596,6 @@
Files:
- ./Applications/CLI/DiffeomorphicDemonsRegistration/DemonsRegistration.cxx
-Copyright: Tom Vercauteren, INRIA & Mauna Kea Technologies
-License: BSD
- On Debian systems the full text of the BSD License can be
- found in the `/usr/share/common-licenses/BSD' file.
-
-
-Files:
./Modules/Meshing/Common/vtkPVAxesActor.cxx
./Modules/Meshing/Common/vtkPVAxesActor.h
Copyright: Kitware, Inc.
@@ -652,8 +644,29 @@
./Base/GUI/Python/ipTk.py
Copyright: 2009, Demian Wassermann, EPI Odyssee, INRIA Sophia-Antipolis
License: BSD
- On Debian systems the full text of the BSD License can be
- found in the `/usr/share/common-licenses/BSD' file.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
Files:
@@ -711,7 +724,28 @@
Files: debian/*
-Copyright: 2008-2009, Dominique Belhachemi <domibel at debian.org>
+Copyright: 2008-2010, Dominique Belhachemi <domibel at debian.org>
License: BSD
- On Debian systems the full text of the BSD License can be
- found in the `/usr/share/common-licenses/BSD' file.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
Modified: packages/slicer/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/get-orig-source?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/get-orig-source (original)
+++ packages/slicer/trunk/debian/get-orig-source Sat Feb 19 23:01:00 2011
@@ -11,28 +11,49 @@
fi
REVISION=`echo $VERSION | sed -e 's/^.*svn//g'`
-#REVISION=10509
-FOLDER=${PACKAGE}-${VERSION}
+
if [ -z ${TARFILE}]; then
TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
fi
-svn export --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/branches/Slicer-3-4 ${FOLDER}
+FOLDER=${PACKAGE}-${VERSION}
+
+#svn checkout --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/trunk ${FOLDER}
+#svn export --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/trunk ${FOLDER}
+svn export --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/branches/Slicer-3-6 ${FOLDER}
cd ${FOLDER}
-rm -rf ./Utilities/Launcher/Slicer3Launchers/
+#rm ./Utilities/Launcher/*.tcl
+#rm ./Utilities/Launcher/CMakeLists.txt
+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
+#rm -f ./Modules/ChangeTracker/Simulation/original.raw.gz
+#rm -f ./Modules/ChangeTracker/Testing/scan1.raw.gz
# remove jar files
rm -rf ./Modules/QueryAtlas/OntologyViz/
+#rm -rf ./Testing/
+#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/StandardData/StandardSegmentationResult_small_normalizationOn.raw
+#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/StandardData/StandardSegmentationResult_small.raw
+#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/atlasBackgroundReg_small.raw
+#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/atlasCSFReg_small.raw
+#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/atlasGreymatterReg_small.raw
+#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/atlasWhitematterReg_small.raw
+#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/segmentationResult_small.raw
+#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/targetT1Normed_small.raw
+#rm ./Modules/EMSegment/Testing/TestData/TutorialTest/VolumeData/targetT2Normed_small.raw
rm ./Modules/Editor/ImageData/Thumbs.db
rm ./Modules/MRAblation/.vtkMRAblationLogic.cxx.swo
rm -rf ./Modules/ProstateNav/newmat
+#grep -rnl Davies ./Modules/ProstateNav/newmat/ | xargs rm
cd ..
GZIP=-9 tar czf ${TARFILE} ${FOLDER}
rm -rf ${FOLDER}
+
Modified: packages/slicer/trunk/debian/libslicer3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/libslicer3.lintian-overrides?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/libslicer3.lintian-overrides (original)
+++ packages/slicer/trunk/debian/libslicer3.lintian-overrides Sat Feb 19 23:01:00 2011
@@ -1,1 +1,1 @@
-libslicer3: package-name-doesnt-match-sonames libCommandIO3 libFreeSurfer3 libIGT3 libLoadableModule3 libMGHIO3 libMRML3 libMRMLIDIO3 libModuleDescriptionParser3 libQdec3 libRemoteIO3 libvtkITK3 libvtkTeem3
+libslicer3: package-name-doesnt-match-sonames libCommandIO3.6 libFreeSurfer3.6 libFreeSurferPython3.6 libFreeSurferPythonD3.6 libIGT3.6 libLoadableModule3.6 libMGHIO3.6 libMRML3.6 libMRMLCLI3.6 libMRMLIDIO3.6 libMRMLPython3.6 libMRMLPythonD3.6 libModuleDescriptionParser3.6 libRemoteIO3.6 libRemoteIOPython3.6 libRemoteIOPythonD3.6 libvtkITK3.6 libvtkTeem3.6 libvtkTeemPython3.6 libvtkTeemPythonD3.6
Modified: packages/slicer/trunk/debian/patches/50_all_changes.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/patches/50_all_changes.diff?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.diff (original)
+++ packages/slicer/trunk/debian/patches/50_all_changes.diff Sat Feb 19 23:01:00 2011
@@ -1,86 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_all_changes.dpatch by <domibel at sid1500>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch adds soname version numbers
+## This patch adds soname version numbers
+## MRIBiasFieldCorrection is using code from review, cant compile it
-Index: slicer-3.4.0~svn10438/Applications/CLI/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/CLI/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-+++ slicer-3.4.0~svn10438/Applications/CLI/CMakeLists.txt 2010-06-08 19:13:20.000000000 -0400
-@@ -269,34 +269,6 @@
- target_link_libraries (${CLP}Lib ITKIO ITKBasicFilters)
-
- #####################
--set (CLP DicomToNrrdConverter)
--
--set ( ${CLP}_SOURCE ${CLP}.cxx)
--generateclp(${CLP}_SOURCE ${CLP}.xml ${Slicer3_SOURCE_DIR}/Resources/NAMICLogo.h)
--add_executable(${CLP} ${${CLP}_SOURCE})
--slicer3_set_plugins_output_path(${CLP})
--target_link_libraries (${CLP} ITKIO ITKBasicFilters)
--
--add_library(${CLP}Lib SHARED ${${CLP}_SOURCE})
--slicer3_set_plugins_output_path(${CLP}Lib)
--set_target_properties (${CLP}Lib PROPERTIES COMPILE_FLAGS "-Dmain=ModuleEntryPoint")
--target_link_libraries (${CLP}Lib ITKIO ITKBasicFilters)
--
--#####################
--set (CLP DWIDicomLoad)
--
--set ( ${CLP}_SOURCE ${CLP}.cxx)
--generateclp(${CLP}_SOURCE ${CLP}.xml ${Slicer3_SOURCE_DIR}/Resources/NAMICLogo.h)
--add_executable(${CLP} ${${CLP}_SOURCE})
--slicer3_set_plugins_output_path(${CLP})
--target_link_libraries (${CLP} ITKIO ITKBasicFilters)
--
--add_library(${CLP}Lib SHARED ${${CLP}_SOURCE})
--slicer3_set_plugins_output_path(${CLP}Lib)
--set_target_properties (${CLP}Lib PROPERTIES COMPILE_FLAGS "-Dmain=ModuleEntryPoint")
--target_link_libraries (${CLP}Lib ITKIO ITKBasicFilters)
--
--#####################
- set (CLP HistogramMatching)
-
- set ( ${CLP}_SOURCE ${CLP}.cxx)
-@@ -583,11 +555,11 @@
-
- else ( ${ITK_VERSION_MAJOR} GREATER 3 )
-
-- if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
-+ if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 18 )
-
- subdirs( RegisterImagesModule )
-
-- else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
-+ else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 18 )
-
- if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
- if ( ITK_USE_OPTIMIZED_REGISTRATION_METHODS )
-@@ -599,7 +571,7 @@
- message ("RegisterImagesModule requires ITK version 3.8 or higher")
- endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
-
-- endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
-+ endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 18 )
-
- endif ( ${ITK_VERSION_MAJOR} GREATER 3 )
-
-@@ -677,10 +649,6 @@
- CheckerBoardLib
- GaussianBlurImageFilter
- GaussianBlurImageFilterLib
-- DicomToNrrdConverter
-- DicomToNrrdConverterLib
-- DWIDicomLoad
-- DWIDicomLoadLib
- FreesurferSurfaceSectionExtraction
- ZeroCrossingBasedEdgeDetectionImageFilter
- ZeroCrossingBasedEdgeDetectionImageFilterLib
-Index: slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2008-06-24 18:14:09.000000000 -0400
-+++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
+Index: slicer-3.6.2~svn15699/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
@@ -18,8 +18,8 @@
#
@@ -88,20 +12,11 @@
-find_package(SLICERLIBCURL REQUIRED)
-include(${SLICERLIBCURL_USE_FILE})
+find_package(CURL REQUIRED)
-+include_directories(${CURL_INCLUDE_DIRS})
++include(${CURL_INCLUDE_DIRS})
#
# Find GenerateCLP
-@@ -39,7 +39,7 @@
- add_executable(DownloadSlicerTutorials ${DownloadSlicerTutorials_SOURCE})
- slicer3_set_plugins_output_path(DownloadSlicerTutorials)
- target_link_libraries(DownloadSlicerTutorials
-- ${SLICERLIBCURL_LIBRARIES} ITKIO MRMLIDIO itkzlib)
-+ ${CURL_LIBRARIES} ITKIO MRMLIDIO)
-
- #
- # Generate shared loadable slicer module
-@@ -49,7 +49,7 @@
+@@ -42,7 +42,7 @@
COMPILE_FLAGS "-Dmain=ModuleEntryPoint")
slicer3_set_plugins_output_path(DownloadSlicerTutorialsModule)
target_link_libraries(DownloadSlicerTutorialsModule
@@ -109,11 +24,11 @@
+ ${CURL_LIBRARIES} ITKIO MRMLIDIO)
#
- # Move exec and module to where Slicer can find them
-Index: slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
-===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-04-10 13:33:12.000000000 -0400
-+++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-06-08 17:43:36.000000000 -0400
+ # Generate executable
+Index: slicer-3.6.2~svn15699/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-12-26 21:08:16.000000000 -0500
@@ -3,7 +3,7 @@
#endif
@@ -123,16 +38,16 @@
#include <itksys/SystemTools.hxx>
#include <itksys/Process.h>
#include <math.h>
-Index: slicer-3.4.0~svn10438/Applications/GUI/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/GUI/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn10438/Applications/GUI/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
+Index: slicer-3.6.2~svn15699/Applications/GUI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Applications/GUI/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Applications/GUI/CMakeLists.txt 2010-12-26 21:10:28.000000000 -0500
@@ -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}\"")
set(Slicer3_FORWARD_PATH_INSTALL
- "\"../${Slicer3_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\",\"../lib/KWWidgets\",\"../lib/InsightToolkit\",\"../lib/Teem-${Teem_VERSION_MAJOR}.${Teem_VERSION_MINOR}\",\"../lib/TclTk/lib\",\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\",\"../lib/FreeSurfer\",\"../lib/IGT\",\"../lib/ITKCommandIO\",\"../lib/LoadableModule\",\"../lib/MGHImageIO\",\"../lib/MRML\",\"../lib/ModuleDescriptionParser\",\"../lib/MRMLIDImageIO\",\"../lib/Qdec\",\"../lib/RemoteIO\",\"../lib/SlicerIO\",\"../lib/tclap\",\"../lib/vtkITK\",\"../lib/vtkTeem\"")
-+ "\"../${Slicer3_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\",\"../lib/KWWidgets\",\"../lib/InsightToolkit\"")
++ "\"../${Slicer3_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\"")
if(Slicer3_BUILD_MODULES)
set(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer3_INSTALL_MODULES_BIN_DIR}\"")
@@ -145,15 +60,15 @@
+#find_package(SLICERLIBCURL REQUIRED)
+#include(${SLICERLIBCURL_USE_FILE})
+find_package(CURL REQUIRED)
-+include_directories(${CURL_INCLUDE_DIRS})
++include(${CURL_INCLUDE_DIRS})
# --------------------------------------------------------------------------
# Include dirs
-Index: slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx
-===================================================================
---- slicer-3.4.0~svn10438.orig/Applications/GUI/Slicer3.cxx 2009-08-14 17:10:13.000000000 -0400
-+++ slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx 2010-06-08 17:43:36.000000000 -0400
-@@ -411,7 +411,7 @@
+Index: slicer-3.6.2~svn15699/Applications/GUI/Slicer3.cxx
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Applications/GUI/Slicer3.cxx 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Applications/GUI/Slicer3.cxx 2010-12-26 21:08:16.000000000 -0500
+@@ -449,7 +449,7 @@
}
std::string tclEnv = "TCL_LIBRARY=";
@@ -162,142 +77,12 @@
vtkKWApplication::PutEnv(const_cast <char *> (tclEnv.c_str()));
// ITK factories dir
-Index: slicer-3.4.0~svn10438/Base/CLI/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Base/CLI/CMakeLists.txt 2008-05-20 03:31:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Base/CLI/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -58,6 +58,11 @@
- slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
- slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} SlicerBaseCLI)
-
-+SET_TARGET_PROPERTIES(SlicerBaseCLI PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- install(TARGETS SlicerBaseCLI
- RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-Index: slicer-3.4.0~svn10438/Base/GUI/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Base/GUI/CMakeLists.txt 2009-03-16 11:34:28.000000000 -0400
-+++ slicer-3.4.0~svn10438/Base/GUI/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -177,6 +177,11 @@
- RemoteIO
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
- slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
-
-Index: slicer-3.4.0~svn10438/Base/Logic/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Base/Logic/CMakeLists.txt 2008-11-05 14:25:28.000000000 -0500
-+++ slicer-3.4.0~svn10438/Base/Logic/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -115,6 +115,11 @@
- slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
- slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- install(TARGETS ${lib_name}
- RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-Index: slicer-3.4.0~svn10438/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/CMakeLists.txt 2009-04-22 19:00:01.000000000 -0400
-+++ slicer-3.4.0~svn10438/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -27,6 +27,11 @@
-
- set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
-
-+# TCL
-+find_package(TCL REQUIRED)
-+
-+
-+
- #-----------------------------------------------------------------------------
- # Disable the warnings that DevStudio 2005 emits wrt to sprintf, strcpu, etc.
- #
-@@ -60,6 +65,9 @@
- set(Slicer3_VERSION "${Slicer3_VERSION_MAJOR}.${Slicer3_VERSION_MINOR}")
- set(Slicer3_VERSION_FULL "${Slicer3_VERSION}.${Slicer3_VERSION_PATCH}")
-
-+set ( Slicer3_SHAREDLIB_VERSION ${Slicer3_VERSION_FULL} )
-+string ( REGEX MATCH "^[0-9]+" Slicer3_SHAREDLIB_SOVERSION ${Slicer3_SHAREDLIB_VERSION} )
-+
- #-----------------------------------------------------------------------------
- # Build shared lib by default
- #
-@@ -159,10 +167,15 @@
- include(${Teem_USE_FILE})
-
- ## SlicerLibCurl
--find_package(SLICERLIBCURL REQUIRED)
--if(SLICERLIBCURL_FOUND)
-- include(${SLICERLIBCURL_USE_FILE})
--endif(SLICERLIBCURL_FOUND)
-+#find_package(SLICERLIBCURL REQUIRED)
-+#if(SLICERLIBCURL_FOUND)
-+# include(${SLICERLIBCURL_USE_FILE})
-+#endif(SLICERLIBCURL_FOUND)
-+find_package(CURL REQUIRED)
-+if(CURL_FOUND)
-+ # Add include directories needed to use CURL.
-+ include_directories(${CURL_INCLUDE_DIRS})
-+endif(CURL_FOUND)
-
- ## BatchMake
- option(Slicer3_USE_BatchMake "Build Slicer3 with BatchMake support." OFF)
-@@ -178,7 +191,7 @@
- option(Slicer3_USE_OPENIGTLINK "Build Slicer3 with OpenIGTLink support." OFF)
- if(Slicer3_USE_OPENIGTLINK)
- find_package(OpenIGTLink REQUIRED)
-- include(${OpenIGTLink_USE_FILE})
-+ include_directories(${OpenIGTLink_INCLUDE_DIRS})
- endif(Slicer3_USE_OPENIGTLINK)
-
- #-----------------------------------------------------------------------------
-@@ -382,6 +395,7 @@
- ${Slicer3_SOURCE_DIR}/CTestConfig.cmake
- ${Slicer3_BINARY_DIR}/UseSlicer3.cmake
- ${Slicer3_BINARY_DIR}/Utilities/Slicer3Config.cmake
-+ ${Slicer3_BINARY_DIR}/lib/Slicer3/Slicer3Version.txt
- DESTINATION ${Slicer3_INSTALL_LIB_DIR}
- COMPONENT Development
- )
-Index: slicer-3.4.0~svn10438/Libs/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/CMakeLists.txt 2008-11-05 18:39:51.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -1,7 +1,6 @@
- project(SlicerLibs)
-
- set(dirs
-- tclap
- ModuleDescriptionParser
- GenerateCLP
- LoadableModule
-Index: slicer-3.4.0~svn10438/Libs/FreeSurfer/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/FreeSurfer/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/FreeSurfer/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -68,9 +68,14 @@
- vtkIOTCL
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
+Index: slicer-3.6.2~svn15699/Libs/FreeSurfer/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/FreeSurfer/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/FreeSurfer/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -95,7 +95,7 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
@@ -305,57 +90,36 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Libs/GenerateCLP/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/GenerateCLP/CMakeLists.txt 2008-05-27 18:36:34.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/GenerateCLP/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -11,10 +11,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.4.0~svn10438/Libs/GenerateCLP/UseGenerateCLP.cmake.in
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/GenerateCLP/UseGenerateCLP.cmake.in 2008-05-26 11:07:36.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/GenerateCLP/UseGenerateCLP.cmake.in 2010-06-08 17:43:36.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.4.0~svn10438/Libs/IGT/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/IGT/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/IGT/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -139,9 +139,14 @@
- ${TRACKING_INTERFACE_LIB}
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
+@@ -125,9 +125,22 @@
+ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES SUFFIX ".pyd")
+ ENDIF(WIN32 AND NOT CYGWIN)
+
++
++ # Apply user-defined properties to the library target.
++ IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
++ )
++ SET_TARGET_PROPERTIES(${lib_name}PythonD PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
++ )
++ ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ INSTALL(TARGETS ${lib_name}PythonD ${lib_name}Python
+ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
+- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
+
+ ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
+Index: slicer-3.6.2~svn15699/Libs/IGT/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/IGT/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/IGT/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -157,7 +157,7 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
@@ -363,19 +127,12 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Libs/ITKCommandIO/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/ITKCommandIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/ITKCommandIO/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -71,9 +71,14 @@
- ITKIO
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
+Index: slicer-3.6.2~svn15699/Libs/ITKCommandIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/ITKCommandIO/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/ITKCommandIO/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -75,7 +75,7 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
@@ -383,19 +140,12 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Libs/LoadableModule/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/LoadableModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/LoadableModule/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -116,9 +116,14 @@
-
- target_link_libraries(${lib_name} ${link_libs})
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
+Index: slicer-3.6.2~svn15699/Libs/LoadableModule/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/LoadableModule/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/LoadableModule/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -127,7 +127,7 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
@@ -403,19 +153,12 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Libs/MGHImageIO/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/MGHImageIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/MGHImageIO/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -59,9 +59,14 @@
- ITKIO
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
+Index: slicer-3.6.2~svn15699/Libs/MGHImageIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/MGHImageIO/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/MGHImageIO/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -63,7 +63,7 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
@@ -423,19 +166,12 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Libs/MRML/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/MRML/CMakeLists.txt 2009-02-27 17:28:47.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/MRML/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -237,9 +237,14 @@
- endif(MRML_USE_vtkTeem)
- endif(MRML_USE_Teem)
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
+Index: slicer-3.6.2~svn15699/Libs/MRML/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/MRML/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/MRML/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -268,7 +268,7 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
@@ -443,19 +179,35 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Libs/MRMLIDImageIO/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/MRMLIDImageIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/MRMLIDImageIO/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -78,9 +78,14 @@
- vtkImaging
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
+@@ -298,9 +298,21 @@
+ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES SUFFIX ".pyd")
+ ENDIF(WIN32 AND NOT CYGWIN)
+
++ # Apply user-defined properties to the library target.
++ IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
++ )
++ SET_TARGET_PROPERTIES(${lib_name}PythonD PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
++ )
++ ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ INSTALL(TARGETS ${lib_name}PythonD ${lib_name}Python
+ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
+- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
+
+ ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
+Index: slicer-3.6.2~svn15699/Libs/MRMLIDImageIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/MRMLIDImageIO/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/MRMLIDImageIO/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -85,7 +85,7 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
@@ -463,63 +215,11 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Libs/ModuleDescriptionParser/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/ModuleDescriptionParser/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -120,9 +120,14 @@
-
- target_link_libraries(${lib_name} ${link_libs})
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- 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.4.0~svn10438/Libs/Qdec/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/Qdec/CMakeLists.txt 2008-05-31 13:31:15.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/Qdec/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -76,9 +76,14 @@
- # vtkIOTCL
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- 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.4.0~svn10438/Libs/Qdec/QdecContrast.cpp
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/Qdec/QdecContrast.cpp 2010-06-08 17:43:36.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/Qdec/QdecContrast.cpp 2010-06-08 17:43:36.000000000 -0400
-@@ -17,6 +17,7 @@
- #include <errno.h>
- #include <sys/stat.h>
- #include <cassert>
-+#include <cstdio>
-
- #include "QdecContrast.h"
-
-Index: slicer-3.4.0~svn10438/Libs/RemoteIO/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/RemoteIO/CMakeLists.txt 2008-10-10 10:41:24.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/RemoteIO/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -11,8 +11,11 @@
+Index: slicer-3.6.2~svn15699/Libs/RemoteIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/RemoteIO/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/RemoteIO/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -13,8 +13,11 @@
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
@@ -533,20 +233,17 @@
# Disable MSVC 8 warnings
if(WIN32)
-@@ -100,13 +103,18 @@
- vtkIOTCL
- vtkCommonTCL
- itksys
+@@ -108,7 +111,7 @@
+ )
+
+ SET(libs
- ${SLICERLIBCURL_LIBRARIES}
+ ${CURL_LIBRARIES}
- MRML
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
+ ${VTK_LIBRARIES}
+ )
+
+@@ -123,7 +126,7 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
@@ -554,10 +251,34 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Libs/RemoteIO/vtkHTTPHandler.h
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/RemoteIO/vtkHTTPHandler.h 2010-06-08 17:43:36.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/RemoteIO/vtkHTTPHandler.h 2010-06-08 17:43:36.000000000 -0400
+@@ -153,9 +156,22 @@
+ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES SUFFIX ".pyd")
+ ENDIF(WIN32 AND NOT CYGWIN)
+
++ # Apply user-defined properties to the library target.
++ IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
++ )
++ SET_TARGET_PROPERTIES(${lib_name}PythonD PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
++ )
++ ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
++
+ INSTALL(TARGETS ${lib_name}PythonD ${lib_name}Python
+ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
+- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
+
+ ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
+Index: slicer-3.6.2~svn15699/Libs/RemoteIO/vtkHTTPHandler.h
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/RemoteIO/vtkHTTPHandler.h 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/RemoteIO/vtkHTTPHandler.h 2010-12-26 21:08:16.000000000 -0500
@@ -5,7 +5,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -567,11 +288,11 @@
#include <vtkRemoteIOConfigure.h>
#include "vtkRemoteIO.h"
-Index: slicer-3.4.0~svn10438/Libs/SlicerIO/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/SlicerIO/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/SlicerIO/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -48,7 +48,7 @@
+Index: slicer-3.6.2~svn15699/Libs/SlicerIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/SlicerIO/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/SlicerIO/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -50,7 +50,7 @@
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
@@ -580,19 +301,20 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Libs/vtkITK/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkITK/CMakeLists.txt 2009-03-25 19:01:37.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/vtkITK/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -111,9 +111,14 @@
- ITKDICOMParser
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
+Index: slicer-3.6.2~svn15699/Libs/vtkITK/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/vtkITK/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/vtkITK/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -75,7 +75,6 @@
+ vtkITKBSplineTransform.cxx
+ vtkITKTimeSeriesDatabase.cxx
+ vtkITKIslandMath.cxx
+- vtkITKGrowCutSegmentationImageFilter.cxx
+ )
+
+ # Abstract/pure virtual classes
+@@ -152,7 +151,7 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
@@ -600,32 +322,12 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2009-04-03 07:35:43.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-06-08 17:43:36.000000000 -0400
-@@ -34,7 +34,7 @@
- #include <string>
-
- #include "itkMetaDataDictionary.h"
--#include "gdcmDictSet.h" // access to dictionary
-+//#include "gdcmDictSet.h" // access to dictionary
- #include "gdcmDict.h" // access to dictionary
- #include "gdcmDictEntry.h" // access to dictionary
- #include "gdcmGlobal.h" // access to dictionary
-Index: slicer-3.4.0~svn10438/Libs/vtkTeem/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkTeem/CMakeLists.txt 2008-11-05 18:39:51.000000000 -0500
-+++ slicer-3.4.0~svn10438/Libs/vtkTeem/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -111,9 +111,14 @@
- ${Teem_LIBRARIES}
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
+Index: slicer-3.6.2~svn15699/Libs/vtkTeem/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/vtkTeem/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/vtkTeem/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -136,7 +136,7 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
@@ -633,24 +335,34 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Modules/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/CMakeLists.txt 2009-04-30 17:12:13.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -74,7 +74,7 @@
- subdirs(
- OpenIGTLinkIF
- NeuroNav
-- ProstateNav
-+# ProstateNav
- )
- endif(Slicer3_USE_OPENIGTLINK)
-
-Index: slicer-3.4.0~svn10438/Modules/ChangeTracker/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/ChangeTracker/CMakeLists.txt 2009-04-30 13:59:22.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/ChangeTracker/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -40,8 +40,6 @@
+@@ -166,9 +166,21 @@
+ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES SUFFIX ".pyd")
+ ENDIF(WIN32 AND NOT CYGWIN)
+
++ # Apply user-defined properties to the library target.
++ IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
++ )
++ SET_TARGET_PROPERTIES(${lib_name}PythonD PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
++ )
++ ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ INSTALL(TARGETS ${lib_name}PythonD ${lib_name}Python
+ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
+- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
+
+ ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
+Index: slicer-3.6.2~svn15699/Modules/ChangeTracker/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/ChangeTracker/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/ChangeTracker/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -44,8 +44,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
install(FILES
@@ -659,23 +371,11 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-@@ -114,6 +112,11 @@
- )
- slicer3_set_modules_output_path(${lib_name})
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- target_link_libraries(${lib_name}
- ${Slicer3_Libs_LIBRARIES}
- ${Slicer3_Base_LIBRARIES}
-Index: slicer-3.4.0~svn10438/Modules/CommandLineModule/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/CommandLineModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/CommandLineModule/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -31,8 +31,6 @@
+Index: slicer-3.6.2~svn15699/Modules/CommandLineModule/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/CommandLineModule/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/CommandLineModule/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
install(FILES
@@ -684,321 +384,145 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-@@ -86,6 +84,11 @@
+Index: slicer-3.6.2~svn15699/Modules/FetchMI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/FetchMI/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/FetchMI/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -44,8 +44,6 @@
+
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES
+- ${headers}
+- "${CMAKE_CURRENT_BINARY_DIR}/vtkFetchMIConfigure.h"
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+ )
+
+@@ -93,6 +91,13 @@
+ Volumes
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15699/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -41,8 +41,6 @@
+
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES
+- ${headers}
+- "${CMAKE_CURRENT_BINARY_DIR}/vtkGradientAnisotropicDiffusionFilterConfigure.h"
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+ )
+
+@@ -106,6 +104,13 @@
${ITK_LIBRARIES}
)
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- # Python settings
-
- if(Slicer3_USE_PYTHON)
-Index: slicer-3.4.0~svn10438/Modules/EMSegment/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/EMSegment/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/EMSegment/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -44,8 +44,6 @@
- "${CMAKE_CURRENT_SOURCE_DIR}/Registration/*.h"
- )
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkEMSegmentConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -176,6 +174,11 @@
- Volumes
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-Index: slicer-3.4.0~svn10438/Modules/FetchMI/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/FetchMI/CMakeLists.txt 2009-02-26 14:03:13.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/FetchMI/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -33,8 +33,6 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkFetchMIConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -91,6 +89,11 @@
- Volumes
- )
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
+Index: slicer-3.6.2~svn15699/Modules/Meshing/IA_FEMesh/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -46,8 +46,6 @@
+
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES
+- ${headers}
+- "${CMAKE_CURRENT_BINARY_DIR}/vtkIA_FEMeshConfigure.h"
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+ )
+
+@@ -104,4 +102,11 @@
+ BuildingBlock
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${LIB_NAME})
+Index: slicer-3.6.2~svn15699/Modules/NeuroNav/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/NeuroNav/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/NeuroNav/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -41,8 +41,6 @@
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+
+ install(FILES
+- ${headers}
+- "${CMAKE_CURRENT_BINARY_DIR}/vtkNeuroNavConfigure.h"
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+ )
+
+@@ -89,6 +87,13 @@
+ ${ITK_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
slicer3_install_modules(${lib_name})
+
+Index: slicer-3.6.2~svn15699/Modules/OpenIGTLinkIF/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -42,8 +42,6 @@
+ )
+
+ install(FILES
+- ${headers}
+- "${CMAKE_CURRENT_BINARY_DIR}/vtkOpenIGTLinkIFConfigure.h"
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+ )
+
+@@ -95,6 +93,14 @@
+ ${ITK_LIBRARIES}
+ ${OpenIGTLink_LIBRARIES}
+ )
++
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
# --------------------------------------------------------------------------
-Index: slicer-3.4.0~svn10438/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -31,8 +31,6 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkGradientAnisotropicDiffusionFilterConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -92,6 +90,11 @@
- ${ITK_LIBRARIES}
- )
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_install_modules(${lib_name})
-
- # --------------------------------------------------------------------------
-Index: slicer-3.4.0~svn10438/Modules/Meshing/Adapter/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/Adapter/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Adapter/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -58,6 +58,11 @@
- ITKAlgorithms
- )
-
-+set_target_properties(${LIB_NAME} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- install(TARGETS ${LIB_NAME}
- RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-Index: slicer-3.4.0~svn10438/Modules/Meshing/BuildingBlock/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/BuildingBlock/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/BuildingBlock/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -173,6 +173,11 @@
- ITKIO
- ITKAlgorithms
- )
-+
-+SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-
-
- #CONFIGURE_FILE(
-Index: slicer-3.4.0~svn10438/Modules/Meshing/Common/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/Common/CMakeLists.txt 2008-12-24 10:07:19.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Common/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -156,6 +156,12 @@
- MRML
- )
-
-+SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
-+
- install(TARGETS ${LIB_NAME}
- RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-Index: slicer-3.4.0~svn10438/Modules/Meshing/Filter/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/Filter/CMakeLists.txt 2008-12-24 10:07:19.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Filter/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -102,6 +102,11 @@
- ${KWWidgets_LIBRARIES}
- )
-
-+SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- install(TARGETS ${LIB_NAME}
- RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-Index: slicer-3.4.0~svn10438/Modules/Meshing/IA_FEMesh/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2008-12-10 09:36:48.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -44,8 +44,6 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkIA_FEMeshConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -102,4 +100,9 @@
- BuildingBlock
- )
-
-+set_target_properties(${LIB_NAME} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_install_modules(${LIB_NAME})
-Index: slicer-3.4.0~svn10438/Modules/Meshing/IO/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/IO/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/IO/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -60,6 +60,11 @@
- vtkRendering
- )
-
-+SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- install(TARGETS ${LIB_NAME}
- RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-Index: slicer-3.4.0~svn10438/Modules/Meshing/Widgets/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/Widgets/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Widgets/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -107,6 +107,11 @@
- mimxFilter
- mimxCommon
- )
-+
-+SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-
- install(TARGETS ${LIB_NAME}
- RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-Index: slicer-3.4.0~svn10438/Modules/NeuroNav/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/NeuroNav/CMakeLists.txt 2008-09-12 13:39:46.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/NeuroNav/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -40,8 +40,6 @@
- "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
- )
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkNeuroNavConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -84,6 +82,11 @@
- ${ITK_LIBRARIES}
- )
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_install_modules(${lib_name})
-
-
-Index: slicer-3.4.0~svn10438/Modules/OpenIGTLinkIF/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/OpenIGTLinkIF/CMakeLists.txt 2008-12-09 16:36:04.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -40,8 +40,6 @@
- )
-
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkOpenIGTLinkIFConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -84,6 +82,10 @@
- )
- slicer3_set_modules_output_path(${lib_name})
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-
- target_link_libraries(${lib_name}
- ${Slicer3_Libs_LIBRARIES}
-Index: slicer-3.4.0~svn10438/Modules/ProstateNav/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/ProstateNav/CMakeLists.txt 2009-02-05 22:44:59.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/ProstateNav/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -17,12 +17,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}
-@@ -82,32 +86,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.4.0~svn10438/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2009-02-04 14:15:57.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-06-08 17:43:36.000000000 -0400
-@@ -37,6 +37,13 @@
+Index: slicer-3.6.2~svn15699/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-12-26 21:08:16.000000000 -0500
+@@ -31,6 +31,13 @@
class VTK_PROSTATENAV_EXPORT vtkProstateNavCalibrationStep : public vtkProstateNavStep
{
public:
@@ -1012,35 +536,10 @@
static vtkProstateNavCalibrationStep *New();
vtkTypeRevisionMacro(vtkProstateNavCalibrationStep,vtkProstateNavStep);
void PrintSelf(ostream& os, vtkIndent indent);
-Index: slicer-3.4.0~svn10438/Modules/QdecModule/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/QdecModule/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/QdecModule/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -31,8 +31,6 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkQdecModuleConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -73,6 +71,11 @@
- ${ITK_LIBRARIES}
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_install_modules(${lib_name})
-
- # --------------------------------------------------------------------------
-Index: slicer-3.4.0~svn10438/Modules/QueryAtlas/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/QueryAtlas/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/QueryAtlas/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
+Index: slicer-3.6.2~svn15699/Modules/QueryAtlas/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/QueryAtlas/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/QueryAtlas/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
@@ -42,14 +42,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1056,19 +555,21 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
-@@ -111,6 +108,11 @@
- QdecModule
- )
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
+@@ -110,6 +107,13 @@
+ ${ITK_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-@@ -204,14 +206,14 @@
+@@ -203,14 +207,14 @@
OntologyViz/extjars/prefuse.jar
)
@@ -1089,16 +590,16 @@
+# ${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.4.0~svn10438/Modules/RealTimeImaging/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/RealTimeImaging/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/RealTimeImaging/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -32,7 +32,6 @@
+Index: slicer-3.6.2~svn15699/Modules/RealTimeImaging/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/RealTimeImaging/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/RealTimeImaging/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -34,7 +34,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
install(FILES
@@ -1106,11 +607,11 @@
"${CMAKE_CURRENT_BINARY_DIR}/vtkRealTimeImagingConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.4.0~svn10438/Modules/ScriptedModule/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/ScriptedModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/ScriptedModule/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -31,8 +31,6 @@
+Index: slicer-3.6.2~svn15699/Modules/ScriptedModule/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/ScriptedModule/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/ScriptedModule/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
install(FILES
@@ -1119,23 +620,19 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-@@ -68,6 +66,11 @@
+@@ -71,6 +69,7 @@
${ITK_LIBRARIES}
)
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
+
# Python settings
if(Slicer3_USE_PYTHON)
-Index: slicer-3.4.0~svn10438/Modules/SlicerDaemon/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/SlicerDaemon/CMakeLists.txt 2008-12-08 04:31:27.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/SlicerDaemon/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -31,8 +31,6 @@
+Index: slicer-3.6.2~svn15699/Modules/SlicerDaemon/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/SlicerDaemon/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/SlicerDaemon/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
install(FILES
@@ -1144,199 +641,137 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-@@ -69,6 +67,11 @@
+@@ -78,6 +76,7 @@
+ )
+ ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15699/Modules/SlicerWelcome/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/SlicerWelcome/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/SlicerWelcome/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -39,8 +39,6 @@
+
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES
+- ${headers}
+- "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerWelcomeConfigure.h"
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+ )
+
+@@ -82,5 +80,12 @@
+ ${KWWidgets_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+Index: slicer-3.6.2~svn15699/Modules/Statistics/LabelStatistics/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -33,8 +33,6 @@
+
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES
+- ${headers}
+- "${CMAKE_CURRENT_BINARY_DIR}/vtkLabelStatisticsConfigure.h"
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+ )
+
+@@ -75,6 +73,13 @@
${ITK_LIBRARIES}
)
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-Index: slicer-3.4.0~svn10438/Modules/SlicerWelcome/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/SlicerWelcome/CMakeLists.txt 2009-03-27 15:12:39.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/SlicerWelcome/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -37,8 +37,6 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerWelcomeConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -79,5 +77,10 @@
- ${KWWidgets_LIBRARIES}
- )
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
+Index: slicer-3.6.2~svn15699/Modules/Tractography/Display/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/Tractography/Display/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/Tractography/Display/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -33,14 +33,11 @@
+
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES
+- ${headers}
+- "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerTractographyDisplayConfigure.h"
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+ )
+
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/Resources/*.h")
+ install(FILES
+- ${headers}
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
+ )
+
+@@ -87,4 +84,11 @@
+ ${ITK_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
slicer3_install_modules(${lib_name})
-
-Index: slicer-3.4.0~svn10438/Modules/Statistics/LabelStatistics/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -31,8 +31,6 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkLabelStatisticsConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -73,6 +71,11 @@
- ${ITK_LIBRARIES}
- )
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
+Index: slicer-3.6.2~svn15699/Modules/Tractography/FiducialSeeding/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -35,8 +35,6 @@
+
+ file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+ install(FILES
+- ${headers}
+- "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerTractographyFiducialSeedingConfigure.h"
+ DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
+ )
+
+@@ -85,6 +83,7 @@
+ )
+ ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
+
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-Index: slicer-3.4.0~svn10438/Modules/Tractography/Display/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Tractography/Display/CMakeLists.txt 2008-07-10 22:39:00.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Tractography/Display/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -31,14 +31,11 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerTractographyDisplayConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/Resources/*.h")
- install(FILES
-- ${headers}
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
- )
-
-@@ -85,4 +82,9 @@
- ${ITK_LIBRARIES}
- )
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_install_modules(${lib_name})
-Index: slicer-3.4.0~svn10438/Modules/Tractography/FiducialSeeding/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2008-07-30 19:34:00.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -31,8 +31,6 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerTractographyFiducialSeedingConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -75,6 +73,11 @@
- ${ITK_LIBRARIES}
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_install_modules(${lib_name})
-
- # --------------------------------------------------------------------------
-Index: slicer-3.4.0~svn10438/Modules/Tractography/Seeding/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Tractography/Seeding/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn10438/Modules/Tractography/Seeding/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -31,8 +31,6 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerTractographySeedingConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -68,6 +66,11 @@
- ${ITK_LIBRARIES}
- )
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_install_modules(${lib_name})
-
- # --------------------------------------------------------------------------
-Index: slicer-3.4.0~svn10438/Modules/VolumeRendering/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/VolumeRendering/CMakeLists.txt 2009-01-20 16:30:19.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/VolumeRendering/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
+Index: slicer-3.6.2~svn15699/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
install(FILES
- ${headers}
-- "${CMAKE_CURRENT_BINARY_DIR}/vtkVolumeRenderingConfigure.h"
- DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
- )
-
-@@ -95,6 +93,11 @@
- VolumeRenderingReplacements
- )
-
-+set_target_properties(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_install_modules(${lib_name})
-
- # --------------------------------------------------------------------------
-Index: slicer-3.4.0~svn10438/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-01-07 14:02:39.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -31,8 +31,6 @@
-
- file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
- install(FILES
-- ${headers}
- "${CMAKE_CURRENT_BINARY_DIR}/vtkVolumeRenderingReplacementsConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-@@ -88,4 +86,9 @@
- ${ITK_LIBRARIES}
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_install_modules(${lib_name})
-Index: slicer-3.4.0~svn10438/Modules/Volumes/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Volumes/CMakeLists.txt 2009-01-20 17:30:16.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Volumes/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -37,7 +37,6 @@
+Index: slicer-3.6.2~svn15699/Modules/Volumes/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/Volumes/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/Volumes/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -48,7 +48,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
install(FILES
@@ -1344,26 +779,16 @@
"${CMAKE_CURRENT_BINARY_DIR}/vtkVolumesConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-@@ -98,6 +97,11 @@
- SlicerTractographyFiducialSeeding
- )
-
-+SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
-+ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
-+ VERSION ${Slicer3_SHAREDLIB_VERSION}
-+)
-+
- slicer3_install_modules(${lib_name})
-
- # --------------------------------------------------------------------------
-Index: slicer-3.4.0~svn10438/Scripts/versioner.tcl
-===================================================================
---- slicer-3.4.0~svn10438.orig/Scripts/versioner.tcl 2009-03-24 16:08:31.000000000 -0400
-+++ slicer-3.4.0~svn10438/Scripts/versioner.tcl 2010-06-08 17:43:36.000000000 -0400
-@@ -16,13 +16,6 @@
-
- ################################################################################
-
+Index: slicer-3.6.2~svn15699/Scripts/versioner.tcl
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Scripts/versioner.tcl 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Scripts/versioner.tcl 2010-12-26 21:08:16.000000000 -0500
+@@ -14,15 +14,6 @@
+ # Initiated - sp - 2009-03-24
+ #
+
+-################################################################################
+-
-# for subversion repositories (Sandbox)
-if {[info exists ::env(SVN)]} {
- set ::SVN $::env(SVN)
@@ -1374,16 +799,17 @@
################################################################################
# build the lib/Slicer3/Slicer3version.txt file
-@@ -36,28 +29,16 @@
+@@ -36,31 +27,18 @@
cd [file dirname [info script]]
cd ..
set ::Slicer3_HOME [pwd]
-
-source $::Slicer3_HOME/slicer_variables.tcl
+-
+set ::Slicer3_BUILD $::Slicer3_HOME/DEB_build_shared
-
set ::Slicer3_BUILDDATE [clock format [clock seconds] -format %Y-%m-%d]
+ set ::ENV(LANG) "C"
-set svninfo [split [exec svn info] "\n"]
-array set svn ""
-foreach line $svninfo {
@@ -1398,26 +824,209 @@
-}
cd $cwd
- set fp [open $::Slicer3_BUILD/lib/Slicer3/Slicer3Version.txt "w"]
--puts $fp "build $::env(BUILD)"
-+puts $fp "os $::tcl_platform(os)"
-+puts $fp "machine $::tcl_platform(machine)"
- puts $fp "buildDate $::Slicer3_BUILDDATE"
--puts $fp "svnurl $svn(URL)"
--puts $fp "svnrevision $svn(revision)"
-+puts $fp "svnurl http://svn.slicer.org/Slicer3/branches/Slicer-3-4"
-+puts $fp "svnrevision 10317"
- close $fp
-Index: slicer-3.4.0~svn10438/Utilities/Launcher/CMakeLists.txt
-===================================================================
---- slicer-3.4.0~svn10438.orig/Utilities/Launcher/CMakeLists.txt 2008-09-25 15:26:44.000000000 -0400
-+++ slicer-3.4.0~svn10438/Utilities/Launcher/CMakeLists.txt 2010-06-08 17:43:36.000000000 -0400
-@@ -40,11 +40,11 @@
- set(launcher_source
+ set versionText ""
+-set versionText "${versionText}build $::env(BUILD)\n"
++set versionText "${versionText}os $::tcl_platform(os)"
++set versionText "${versionText}machine $::tcl_platform(machine)"
+ set versionText "${versionText}buildDate $::Slicer3_BUILDDATE\n"
+-set versionText "${versionText}svnurl $svn(URL)\n"
+-set versionText "${versionText}svnrevision $svn(revision)\n"
++set versionText "${versionText}svnurl http://svn.slicer.org/Slicer3/trunk\n"
++set versionText "${versionText}svnrevision 14971\n"
+
+ set versionFile $::Slicer3_BUILD/lib/Slicer3/Slicer3Version.txt
+ puts "Writing version information to $versionFile"
+Index: slicer-3.6.2~svn15699/Applications/CLI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Applications/CLI/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Applications/CLI/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -313,7 +313,7 @@
+ slicer3_set_plugins_output_path(${CLP})
+ target_link_libraries (${CLP} ${CLP}Lib)
+ #####################
+-add_subdirectory(DicomToNrrdConverter)
++###add_subdirectory(DicomToNrrdConverter)
+ #####################
+ # set (CLP DWIDicomLoad)
+
+@@ -703,14 +703,14 @@
+ ###################
+
+ SET(cli_modules
+- MRIBiasFieldCorrection
++ #MRIBiasFieldCorrection
+ SparseFieldLevelSetContour
+ Realign
+ DiffusionApplications
+ #EndoNavTracking
+ ExtractSkeleton
+ #Java
+- N4ITKBiasFieldCorrection
++ #N4ITKBiasFieldCorrection
+ RobustStatisticsSegmenter
+ )
+
+@@ -720,11 +720,11 @@
+
+ else ( ${ITK_VERSION_MAJOR} GREATER 3 )
+
+- if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
++ if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 20 )
+
+ SET(cli_modules ${cli_modules} RegisterImagesModule)
+
+- else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
++ else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 20 )
+
+ if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
+ if ( ITK_USE_OPTIMIZED_REGISTRATION_METHODS )
+@@ -736,7 +736,7 @@
+ message ("RegisterImagesModule requires ITK version 3.8 or higher")
+ endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
+
+- endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
++ endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 20 )
+
+ endif ( ${ITK_VERSION_MAJOR} GREATER 3 )
+
+Index: slicer-3.6.2~svn15699/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -29,6 +29,11 @@
+
+ set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
+
++
++# TCL
++find_package(TCL REQUIRED)
++
++
+ #-----------------------------------------------------------------------------
+ # Disable the warnings that DevStudio 2005 emits wrt to sprintf, strcpu, etc.
+ #
+@@ -295,10 +300,11 @@
+
+ #-----------------------------------------------------------------------------
+ ## SlicerLibCurl
+-find_package(SLICERLIBCURL REQUIRED)
+-if(SLICERLIBCURL_FOUND)
+- include(${SLICERLIBCURL_USE_FILE})
+-endif(SLICERLIBCURL_FOUND)
++find_package(CURL REQUIRED)
++if(CURL_FOUND)
++ # Add include directories needed to use CURL.
++ include_directories(${CURL_INCLUDE_DIRS})
++endif(CURL_FOUND)
+
+ #-----------------------------------------------------------------------------
+ ## BatchMake
+@@ -317,7 +323,7 @@
+ option(Slicer3_USE_OPENIGTLINK "Build Slicer3 with OpenIGTLink support." OFF)
+ if(Slicer3_USE_OPENIGTLINK)
+ find_package(OpenIGTLink REQUIRED)
+- include(${OpenIGTLink_USE_FILE})
++ include_directories(${OpenIGTLink_INCLUDE_DIRS})
+ endif(Slicer3_USE_OPENIGTLINK)
+
+ #-----------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15699/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-12-26 21:08:16.000000000 -0500
+@@ -34,7 +34,7 @@
+ #include <string>
+
+ #include "itkMetaDataDictionary.h"
+-#include "gdcmDictSet.h" /// access to dictionary
++// #include "gdcmDictSet.h" /// access to dictionary
+ #include "gdcmDict.h" /// access to dictionary
+ #include "gdcmDictEntry.h" /// access to dictionary
+ #include "gdcmGlobal.h" /// access to dictionary
+Index: slicer-3.6.2~svn15699/CMake/Slicer3FindQT.cmake
+===================================================================
+--- slicer-3.6.2~svn15699.orig/CMake/Slicer3FindQT.cmake 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/CMake/Slicer3FindQT.cmake 2010-12-26 21:08:16.000000000 -0500
+@@ -9,37 +9,37 @@
+
+ IF(Slicer3_USE_QT)
+ SET(minimum_required_qt_version "4.6")
+- IF(VTK_USE_QVTK)
++# IF(VTK_USE_QVTK)
+
+ # Check if QT_QMAKE_EXECUTABLE is set
+- IF(NOT VTK_QT_QMAKE_EXECUTABLE)
+- MESSAGE(FATAL_ERROR "error: There is a problem with your configuration, the variable VTK_QT_QMAKE_EXECUTABLE should be exposed by VTK.")
+- ENDIF()
++# IF(NOT VTK_QT_QMAKE_EXECUTABLE)
++# MESSAGE(FATAL_ERROR "error: There is a problem with your configuration, the variable VTK_QT_QMAKE_EXECUTABLE should be exposed by VTK.")
++# ENDIF()
+
+- SET(QT_QMAKE_EXECUTABLE ${VTK_QT_QMAKE_EXECUTABLE})
++# SET(QT_QMAKE_EXECUTABLE ${VTK_QT_QMAKE_EXECUTABLE})
+
+ FIND_PACKAGE(Qt4)
+
+ MESSAGE(STATUS "Configuring Slicer with Qt ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
+
+- IF(QT4_FOUND AND QT_QMAKE_EXECUTABLE)
++# IF(QT4_FOUND AND QT_QMAKE_EXECUTABLE)
+ # Check version, note that ${QT_VERSION_PATCH} could also be used
+- IF(NOT "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}" STREQUAL "${minimum_required_qt_version}")
+- MESSAGE(FATAL_ERROR "error: Slicer requires Qt >= ${minimum_required_qt_version} -- you cannot use Qt ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}. You should probably reconfigure VTK.")
+- ENDIF()
++# IF(NOT "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}" STREQUAL "${minimum_required_qt_version}")
++# MESSAGE(FATAL_ERROR "error: Slicer requires Qt >= ${minimum_required_qt_version} -- you cannot use Qt ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}. You should probably reconfigure VTK.")
++# ENDIF()
+ # Enable modules
+ SET(QT_USE_QTNETWORK ON)
+ SET(QT_USE_QTTEST ${Slicer3_BUILD_TESTING})
+
+ # Includes Qt headers
+ INCLUDE(${QT_USE_FILE})
+- ELSE(QT4_FOUND AND QT_QMAKE_EXECUTABLE)
+- MESSAGE(FATAL_ERROR "error: Qt >= ${minimum_required_qt_version} was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable.")
+- ENDIF(QT4_FOUND AND QT_QMAKE_EXECUTABLE)
++# ELSE(QT4_FOUND AND QT_QMAKE_EXECUTABLE)
++# MESSAGE(FATAL_ERROR "error: Qt >= ${minimum_required_qt_version} was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable.")
++# ENDIF(QT4_FOUND AND QT_QMAKE_EXECUTABLE)
+
+- ELSE(VTK_USE_QVTK)
+- MESSAGE("error: VTK was not configured to use QT, you probably need to recompile it with VTK_USE_GUISUPPORT ON, VTK_USE_QVTK ON, DESIRED_QT_VERSION 4 and QT_QMAKE_EXECUTABLE set appropriatly. Note that Qt >= ${minimum_required_qt_version} is *required*")
+- ENDIF(VTK_USE_QVTK)
++# ELSE(VTK_USE_QVTK)
++# MESSAGE("error: VTK was not configured to use QT, you probably need to recompile it with VTK_USE_GUISUPPORT ON, VTK_USE_QVTK ON, DESIRED_QT_VERSION 4 and QT_QMAKE_EXECUTABLE set appropriatly. Note that Qt >= ${minimum_required_qt_version} is *required*")
++# ENDIF(VTK_USE_QVTK)
+ ENDIF(Slicer3_USE_QT)
+
+ ENDMACRO(Slicer3_SETUP_QT)
+Index: slicer-3.6.2~svn15699/Libs/MRMLCLI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/MRMLCLI/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/MRMLCLI/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -103,7 +103,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.6.2~svn15699/Utilities/Launcher/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Utilities/Launcher/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Utilities/Launcher/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -39,7 +39,7 @@
"${CMAKE_CURRENT_SOURCE_DIR}/Slicer3Launchers/${launcher_name}")
- set(launcher_binary
+
+ SET(launcher_binary
- "${Slicer3_BINARY_DIR}/Slicer3${CMAKE_EXECUTABLE_SUFFIX}")
+ "${Slicer3_BINARY_DIR}/Slicer3-launcher${CMAKE_EXECUTABLE_SUFFIX}")
+
+ # MESSAGE(STATUS "launcher_platform: ${launcher_platform}")
+ # MESSAGE(STATUS "launcher_name: ${launcher_name}")
+@@ -48,7 +48,7 @@
if(EXISTS "${launcher_source}")
configure_file("${launcher_source}" "${launcher_binary}" COPYONLY)
@@ -1426,240 +1035,214 @@
endif(EXISTS "${launcher_source}")
# Should this location change, change Application/GUI/Slicer3.cxx as well
-Index: slicer-3.4.0~svn10438/launch.tcl.in
-===================================================================
---- slicer-3.4.0~svn10438.orig/launch.tcl.in 2009-08-14 17:10:13.000000000 -0400
-+++ slicer-3.4.0~svn10438/launch.tcl.in 2010-06-08 17:43:36.000000000 -0400
-@@ -100,7 +100,7 @@
-
-
- # if installed, everything is in the local tree
-- set ::Slicer3_REAL $::Slicer3_HOME/bin/Slicer3-real$ext
-+ set ::Slicer3_REAL $::Slicer3_HOME/lib/Slicer3/Slicer3-real
-
- set ::env(SANDBOX_BIN_DIR) ""
-
-@@ -827,11 +827,11 @@
-
- launch_SetPaths
-
--set ret [catch launch_ImportModulePaths res]
--if { $ret } {
-- puts "Could not query slicer for module paths"
-- puts $res
--}
-+#set ret [catch launch_ImportModulePaths res]
-+#if { $ret } {
-+# puts "Could not query slicer for module paths"
-+# puts $res
-+#}
-
- #
- # run program until it exits and then exit this script with the ouput
-Index: slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKIslandMath.cxx
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkITK/vtkITKIslandMath.cxx 2009-04-29 08:17:33.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKIslandMath.cxx 2010-06-08 19:14:05.000000000 -0400
-@@ -165,7 +165,7 @@
- void* outPtr = output->GetScalarPointer();
-
- #if (ITK_VERSION_MAJOR > 3) || \
-- ((ITK_VERSION_MAJOR == 3 && ITK_VERSION_MINOR >= 14))
-+ ((ITK_VERSION_MAJOR == 3 && ITK_VERSION_MINOR >= 20))
- switch (inScalars->GetDataType())
- {
- vtkTemplateMacroCase(VTK_DOUBLE, double, CALL); \
-Index: slicer-3.4.0~svn10438/Libs/vtkTeem/vtkNRRDReader.h
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkTeem/vtkNRRDReader.h 2009-03-20 13:28:51.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/vtkTeem/vtkNRRDReader.h 2010-06-08 17:43:36.000000000 -0400
-@@ -57,6 +57,7 @@
- #define NORMALS 3
- #define TENSORS 4
-
-+
- class VTK_Teem_EXPORT vtkNRRDReader : public vtkMedicalImageReader2
- {
- public:
-Index: slicer-3.4.0~svn10438/Libs/vtkTeem/vtkNRRDReader.cxx
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkTeem/vtkNRRDReader.cxx 2009-03-20 13:28:51.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/vtkTeem/vtkNRRDReader.cxx 2010-06-08 17:43:36.000000000 -0400
-@@ -792,6 +792,7 @@
-
- int
- vtkNRRDReader::tenSpaceDirectionReduce(Nrrd *nout, const Nrrd *nin, double SD[9]) {
-+ #define BIFF_STRLEN (256+1) /* convenience for strlen of error messages */
- char me[]="tenSpaceDirectionReduce", err[BIFF_STRLEN];
- double SDT[9], tenMeasr[9], tenSlice[9];
- size_t ii, nn;
-Index: slicer-3.4.0~svn10438/Modules/Meshing/Widgets/vtkMimxSelectCellsWidgetFEMesh.cxx
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/Widgets/vtkMimxSelectCellsWidgetFEMesh.cxx 2008-12-27 11:34:01.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Widgets/vtkMimxSelectCellsWidgetFEMesh.cxx 2010-06-08 17:43:36.000000000 -0400
-@@ -64,6 +64,9 @@
- #include "vtkPolyDataMapper.h"
- #include "vtkPolyDataSource.h"
- #include "vtkSelection.h"
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+#include "vtkSelectionNode.h"
-+#endif
- #include "vtkSphereSource.h"
- #include "vtkVisibleCellSelector.h"
- #include "vtkWidgetCallbackMapper.h"
-@@ -475,12 +478,20 @@
- vtkSelection *res = vtkSelection::New();
- select->GetSelectedIds(res);
-
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ vtkSelectionNode *cellidssel = res->GetNode(0);
-+#else
- vtkSelection *cellidssel = res->GetChild(0);
-+#endif
- vtkExtractSelectedPolyDataIds *extr = vtkExtractSelectedPolyDataIds::New();
- if (cellidssel)
- {
- extr->SetInput(0, fil->GetOutput());
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ extr->SetInput(1, res);
-+#else
- extr->SetInput(1, cellidssel);
-+#endif
- extr->Update();
- }
- if(extr->GetOutput()->GetNumberOfCells() < 1)
-@@ -521,9 +532,18 @@
- self->Input->GetCellData()->AddArray(globalids);
- self->Input->GetCellData()->SetGlobalIds(globalids);
-
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ selection->RemoveAllNodes();
-+ vtkSelectionNode *node = vtkSelectionNode::New();
-+ selection->AddNode(node);
-+ node->Delete();
-+ node->GetProperties()->Set(
-+ vtkSelectionNode::CONTENT_TYPE(), vtkSelectionNode::GLOBALIDS);
-+#else
- selection->Clear();
- selection->GetProperties()->Set(
- vtkSelection::CONTENT_TYPE(), vtkSelection::GLOBALIDS);
-+#endif
- vtkIdTypeArray *cellIds = vtkIdTypeArray::New();
- cellIds->SetNumberOfComponents(1);
- cellIds->SetNumberOfTuples(self->SelectedCellIds->GetNumberOfIds());
-@@ -531,7 +551,11 @@
- {
- cellIds->SetTuple1(i, self->SelectedCellIds->GetId(i));
- }
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ selection->GetNode(0)->SetSelectionList(cellIds);
-+#else
- selection->SetSelectionList(cellIds);
-+#endif
- cellIds->Delete();
-
- ext->Update();
-@@ -625,10 +649,18 @@
- }
- self->Input->GetCellData()->AddArray(globalids);
- self->Input->GetCellData()->SetGlobalIds(globalids);
--
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ selection->RemoveAllNodes();
-+ vtkSelectionNode *node = vtkSelectionNode::New();
-+ selection->AddNode(node);
-+ node->Delete();
-+ node->GetProperties()->Set(
-+ vtkSelectionNode::CONTENT_TYPE(), vtkSelectionNode::GLOBALIDS);
-+#else
- selection->Clear();
- selection->GetProperties()->Set(
- vtkSelection::CONTENT_TYPE(), vtkSelection::GLOBALIDS);
-+#endif
- vtkIdTypeArray *cellIds = vtkIdTypeArray::New();
- cellIds->SetNumberOfComponents(1);
- cellIds->SetNumberOfTuples(self->SelectedCellIds->GetNumberOfIds());
-@@ -636,7 +668,11 @@
- {
- cellIds->SetTuple1(i, self->SelectedCellIds->GetId(i));
- }
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ selection->GetNode(0)->SetSelectionList(cellIds);
-+#else
- selection->SetSelectionList(cellIds);
-+#endif
- cellIds->Delete();
-
- ext->Update();
-@@ -911,13 +947,20 @@
- self->CurrentRenderer->RemoveActor(self->ExtractedSurfaceActor);
- self->ExtractedSurfaceActor->Delete();
- }
--
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ vtkSelectionNode *cellids = res->GetNode(0);
-+#else
- vtkSelection *cellids = res->GetChild(0);
-+#endif
- vtkExtractSelectedPolyDataIds *extr = vtkExtractSelectedPolyDataIds::New();
- if (cellids)
- {
- extr->SetInput(0, clean->GetOutput());
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ extr->SetInput(1, res);
-+#else
- extr->SetInput(1, cellids);
-+#endif
- extr->Update();
- self->ExtractedSurfaceActor = vtkActor::New();
- vtkPolyDataMapper *mapper = vtkPolyDataMapper::New();
-Index: slicer-3.4.0~svn10438/Modules/Meshing/Widgets/vtkMimxCreateElementSetWidgetFEMesh.cxx
-===================================================================
---- slicer-3.4.0~svn10438.orig/Modules/Meshing/Widgets/vtkMimxCreateElementSetWidgetFEMesh.cxx 2008-12-28 12:14:09.000000000 -0500
-+++ slicer-3.4.0~svn10438/Modules/Meshing/Widgets/vtkMimxCreateElementSetWidgetFEMesh.cxx 2010-06-08 17:43:36.000000000 -0400
-@@ -62,6 +62,9 @@
- #include "vtkPolyDataMapper.h"
- #include "vtkPolyDataSource.h"
- #include "vtkSelection.h"
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+#include "vtkSelectionNode.h"
-+#endif
- #include "vtkVisibleCellSelector.h"
- #include "vtkWidgetCallbackMapper.h"
- #include "vtkWidgetEvent.h"
-@@ -601,13 +604,20 @@
-
- vtkSelection *res = vtkSelection::New();
- select->GetSelectedIds(res);
--
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ vtkSelectionNode *cellidssel = res->GetNode(0);
-+#else
- vtkSelection *cellidssel = res->GetChild(0);
-+#endif
- vtkExtractSelectedPolyDataIds *extr = vtkExtractSelectedPolyDataIds::New();
- if (cellidssel)
- {
- extr->SetInput(0, fil->GetOutput());
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ extr->SetInput(1, res);
-+#else
- extr->SetInput(1, cellidssel);
-+#endif
- extr->Update();
- }
-
-Index: slicer-3.4.0~svn10438/Base/GUI/Tcl/LoadVolume.tcl
-===================================================================
---- slicer-3.4.0~svn10438.orig/Base/GUI/Tcl/LoadVolume.tcl 2009-05-14 17:18:58.000000000 -0400
-+++ slicer-3.4.0~svn10438/Base/GUI/Tcl/LoadVolume.tcl 2010-06-08 17:43:36.000000000 -0400
-@@ -1,4 +1,4 @@
--package require Itcl
-+ package require Itcl
-
- #########################################################
- #
-@@ -965,6 +965,7 @@
+Index: slicer-3.6.2~svn15699/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-12-26 21:08:16.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.6.2~svn15699/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-12-26 21:08:16.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.6.2~svn15699/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-12-26 21:08:16.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.6.2~svn15699/Modules/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -63,7 +63,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??
+@@ -82,7 +82,7 @@
+ # ExtractSubvolumeROI <- renamed to CropVolume
+ CropVolume
+ CollectFiducials
+- PETCTFusion
++# PETCTFusion
+ IGTToolSelector
+ )
+
+@@ -91,7 +91,7 @@
+ ${modules}
+ OpenIGTLinkIF
+ NeuroNav
+- ProstateNav
++# ProstateNav
+ # IGTNavigation
+ # OpenCV
+ )
+Index: slicer-3.6.2~svn15699/Libs/SlicerExecutionModel/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Libs/SlicerExecutionModel/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Libs/SlicerExecutionModel/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -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)
+Index: slicer-3.6.2~svn15699/Base/GUI/Python/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Base/GUI/Python/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Base/GUI/Python/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -87,6 +87,11 @@
+ target_link_libraries( ${lib_name} ${PYTHON_LIBRARIES})
+ endif (WIN32 AND PYTHON_DEBUG_LIBRARIES)
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES ${Slicer3_LIBRARY_PROPERTIES})
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ install(TARGETS ${lib_name}
+ RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.6.2~svn15699/Modules/Measurements/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/Measurements/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/Measurements/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -87,6 +87,13 @@
+ ${KWWidgets_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15699/Modules/ModelTransform/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/ModelTransform/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/ModelTransform/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -87,6 +87,13 @@
+ Volumes
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15699/Modules/ModelMirror/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/ModelMirror/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/ModelMirror/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -88,6 +88,13 @@
+ Volumes
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15699/Modules/FourDImage/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/FourDImage/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/FourDImage/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -105,6 +105,13 @@
+ ${VolumesLib}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ install(TARGETS ${lib_name}
+ RUNTIME DESTINATION ${Slicer3_INSTALL_MODULES_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.6.2~svn15699/Modules/IGTToolSelector/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Modules/IGTToolSelector/CMakeLists.txt 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Modules/IGTToolSelector/CMakeLists.txt 2010-12-26 21:08:16.000000000 -0500
+@@ -82,6 +82,13 @@
+ ${KWWidgets_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ install(TARGETS ${lib_name}
+ RUNTIME DESTINATION ${Slicer3_INSTALL_MODULES_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.6.2~svn15699/Base/GUI/Tcl/LoadVolume.tcl
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Base/GUI/Tcl/LoadVolume.tcl 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Base/GUI/Tcl/LoadVolume.tcl 2010-12-26 21:08:16.000000000 -0500
+@@ -1081,6 +1081,7 @@
}
set dicomDict ""
set dicomDictCandidates [list \
@@ -1667,16 +1250,185 @@
$::Slicer3_BUILD/include/InsightToolkit/gdcm/Dicts/gdcm.dic \
$itkBinDir/../../include/InsightToolkit/gdcm/Dicts/gdcm.dic \
$itkBinDir/../Utilities/gdcm/Dicts/gdcm.dic \
-Index: slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKNumericTraits.h
-===================================================================
---- slicer-3.4.0~svn10438.orig/Libs/vtkITK/vtkITKNumericTraits.h 2010-06-08 19:15:13.000000000 -0400
-+++ slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKNumericTraits.h 2010-06-08 19:15:33.000000000 -0400
-@@ -56,7 +56,7 @@
- };
- #endif
-
--#if defined(VTK_TYPE_USE_LONG_LONG)
-+#if defined(VTK_TYPE_USE_LONG_LONG) && !defined(ITK_TYPE_USE_LONG_LONG)
- template <>
- class NumericTraits<long long> : public vcl_numeric_limits<long long> {
- public:
+Index: slicer-3.6.2~svn15699/Base/Logic/vtkSlicerTransformLogic.cxx
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Base/Logic/vtkSlicerTransformLogic.cxx 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Base/Logic/vtkSlicerTransformLogic.cxx 2010-12-26 21:08:16.000000000 -0500
+@@ -7,8 +7,8 @@
+
+ Program: 3D Slicer
+ Module: $RCSfile: vtkSlicerTransformLogic.cxx,v $
+- Date: $Date: 2010-07-01 17:27:45 -0400 (Thu, 01 Jul 2010) $
+- Version: $Revision: 14011 $
++ Date: $Date: 2010-04-13 15:19:58 +0000 (Tue, 13 Apr 2010) $
++ Version: $Revision: 12724 $
+
+ =========================================================================auto=*/
+
+@@ -27,32 +27,7 @@
+
+ #include "vtkStringArray.h"
+
+-#include "itkAffineTransform.h"
+-#include "itkBSplineDeformableTransform.h"
+-#include "itkCenteredAffineTransform.h"
+-#include "itkCenteredEuler3DTransform.h"
+-#include "itkCenteredRigid2DTransform.h"
+-#include "itkCenteredSimilarity2DTransform.h"
+-#include "itkEuler2DTransform.h"
+-#include "itkEuler3DTransform.h"
+-#include "itkFixedCenterOfRotationAffineTransform.h"
+-#include "itkIdentityTransform.h"
+-#include "itkQuaternionRigidTransform.h"
+-#include "itkRigid2DTransform.h"
+-#include "itkRigid3DPerspectiveTransform.h"
+-#include "itkRigid3DTransform.h"
+-#include "itkScalableAffineTransform.h"
+-#include "itkScaleLogarithmicTransform.h"
+-#include "itkScaleSkewVersor3DTransform.h"
+-#include "itkScaleTransform.h"
+-#include "itkScaleVersor3DTransform.h"
+-#include "itkSimilarity2DTransform.h"
+-#include "itkTranslationTransform.h"
+-#include "itkVersorRigid3DTransform.h"
+-#include "itkVersorTransform.h"
+-#include "itkTransformFactory.h"
+-
+-vtkCxxRevisionMacro(vtkSlicerTransformLogic, "$Revision: 14011 $");
++vtkCxxRevisionMacro(vtkSlicerTransformLogic, "$Revision: 12724 $");
+ vtkStandardNewMacro(vtkSlicerTransformLogic);
+
+ //----------------------------------------------------------------------------
+@@ -160,73 +135,3 @@
+ {
+ return 1;
+ }
+-
+- // Register transform types with ITK factory
+- // This code is from Applications/CLI/BRAINSTools/BRAINSCommonLib/GenericTransformImage.cxx
+- // We do this in order to register ScaleVersor3DTransform, which is not done
+- // in ITK 3.18. The rest of transforms need to be re-registered when a new
+- // transform is added. TODO: this must be revised in 3.20, hopefully
+- // ScaleVersor3DTransform will be out of Review by then
+- void vtkSlicerTransformLogic::RegisterITKTransforms(){
+- //This is needed in order to read and write ScaleVersor3D TransformTypes.
+- //Hopefully in ITK-3-19 this will become part of the non-review transform types.
+- itk::TransformFactory<itk::ScaleVersor3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleVersor3DTransform<float> >::RegisterTransform ();
+-
+- itk::TransformFactory<itk::AffineTransform<double,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::AffineTransform<double,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::BSplineDeformableTransform<double,2,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::BSplineDeformableTransform<double,3,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredAffineTransform<double,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredAffineTransform<double,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredEuler3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredRigid2DTransform < double > >::RegisterTransform();
+- itk::TransformFactory<itk::CenteredSimilarity2DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Similarity2DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Euler2DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Euler3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::FixedCenterOfRotationAffineTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::IdentityTransform<double,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::IdentityTransform<double,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::QuaternionRigidTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid2DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid3DPerspectiveTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScalableAffineTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleLogarithmicTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleSkewVersor3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<double,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<double,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<double,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::TranslationTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::VersorRigid3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::VersorTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::AffineTransform<float,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::AffineTransform<float,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::BSplineDeformableTransform<float,2,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::BSplineDeformableTransform<float,3,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredAffineTransform<float,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredAffineTransform<float,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredEuler3DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredRigid2DTransform < float > >::RegisterTransform();
+- itk::TransformFactory<itk::CenteredSimilarity2DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Similarity2DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Euler2DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Euler3DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::FixedCenterOfRotationAffineTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::IdentityTransform<float,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::IdentityTransform<float,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::QuaternionRigidTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid2DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid3DPerspectiveTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid3DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScalableAffineTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleLogarithmicTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleSkewVersor3DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<float,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<float,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<float,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::TranslationTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::VersorRigid3DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::VersorTransform<float> >::RegisterTransform ();
+- }
+Index: slicer-3.6.2~svn15699/Base/Logic/vtkSlicerTransformLogic.h
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Base/Logic/vtkSlicerTransformLogic.h 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Base/Logic/vtkSlicerTransformLogic.h 2010-12-26 21:08:16.000000000 -0500
+@@ -7,8 +7,8 @@
+
+ Program: 3D Slicer
+ Module: $RCSfile: vtkSlicerTransformLogic.h,v $
+- Date: $Date: 2010-07-01 17:27:45 -0400 (Thu, 01 Jul 2010) $
+- Version: $Revision: 14011 $
++ Date: $Date: 2010-02-15 21:35:35 +0000 (Mon, 15 Feb 2010) $
++ Version: $Revision: 12142 $
+
+ =========================================================================auto=*/
+
+@@ -43,10 +43,6 @@
+ /// Read transform from file
+ vtkMRMLTransformNode* AddTransform (const char* filename, vtkMRMLScene *scene);
+
+- // Register transform types with ITK factory
+- // TODO: revisit this after the next (3.20?) release of ITK is out!!!
+- void RegisterITKTransforms();
+-
+ ///
+ /// Write transform's data to a specified file
+ int SaveTransform (const char* filename, vtkMRMLTransformNode *transformNode);
+Index: slicer-3.6.2~svn15699/Base/GUI/vtkSlicerTransformsGUI.cxx
+===================================================================
+--- slicer-3.6.2~svn15699.orig/Base/GUI/vtkSlicerTransformsGUI.cxx 2010-12-26 21:08:15.000000000 -0500
++++ slicer-3.6.2~svn15699/Base/GUI/vtkSlicerTransformsGUI.cxx 2010-12-26 21:08:16.000000000 -0500
+@@ -20,11 +20,9 @@
+ #include "vtkKWLoadSaveDialog.h"
+ #include "vtkKWLoadSaveButton.h"
+
+-#include "vtkSmartPointer.h"
+-
+ //---------------------------------------------------------------------------
+ vtkStandardNewMacro (vtkSlicerTransformsGUI );
+-vtkCxxRevisionMacro ( vtkSlicerTransformsGUI, "$Revision: 14060 $");
++vtkCxxRevisionMacro ( vtkSlicerTransformsGUI, "$Revision: 13134 $");
+
+
+ //---------------------------------------------------------------------------
+@@ -38,15 +36,6 @@
+ NCIGTLabel = NULL;
+ BIRNLabel = NULL;
+
+- // Register transform types with ITK factory
+- // This code is from Applications/CLI/BRAINSTools/BRAINSCommonLib/GenericTransformImage.cxx
+- // We do this in order to register ScaleVersor3DTransform, which is not done
+- // in ITK 3.18. The rest of transforms need to be re-registered when a new
+- // transform is added. TODO: this must be revised in 3.20, hopefully
+- // ScaleVersor3DTransform will be out of Review by then
+- vtkSmartPointer<vtkSlicerTransformLogic> logic = vtkSmartPointer<vtkSlicerTransformLogic>::New();
+- logic->RegisterITKTransforms();
+-
+ }
+
+
Modified: packages/slicer/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/patches/series?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/series (original)
+++ packages/slicer/trunk/debian/patches/series Sat Feb 19 23:01:00 2011
@@ -1,2 +1,1 @@
-20_svn.diff
50_all_changes.diff
Modified: packages/slicer/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/rules?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/rules (original)
+++ packages/slicer/trunk/debian/rules Sat Feb 19 23:01:00 2011
@@ -32,12 +32,16 @@
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
-DVOLUMERENDERINGMODULE:BOOL=ON \
-DCMAKE_SKIP_RPATH:BOOL=OFF \
- -DBUILD_TESTING:BOOL=OFF \
- -DCMAKE_SHARED_LINKER_FLAGS:STRING=-Wl,--as-needed \
- -DCMAKE_EXE_LINKER_FLAGS:STRING=-Wl,--as-needed \
+ -DBUILD_TESTING:BOOL=ON \
+ -DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--as-needed" \
+ -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,--as-needed" \
-DSlicer3_USE_IGSTK:BOOL=OFF \
-DSlicer3_USE_OPENIGTLINK:BOOL=ON \
-DSlicer3_USE_MIDAS:BOOL=ON \
+ -DSlicer3_WITH_LIBRARY_VERSION:BOOL=ON \
+ -DBUILD_BRAINSTOOLS:BOOL=OFF \
+ -DSlicer3_USE_QT:BOOL=OFF \
+ -DSlicer3_USE_PYTHON:BOOL=ON
get-orig-source:
@@ -56,8 +60,10 @@
&& cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON
touch $@
-
-build: configure-stamp
+
+
+build: build-stamp
+build-stamp: configure
dh_testdir
# Add here commands to compile the package.
@@ -98,21 +104,21 @@
cd $(SHARED_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# remove empty directories
- rmdir $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/EMSegment/Testing/TestData/TutorialTest2/VolumeData/Working/
rmdir $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/ModelIntoLabelVolume/Testing/TestData/
rmdir $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/ModelIntoLabelVolume/Testing/
rmdir $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/ModelIntoLabelVolume/
+
chmod +x $(CURDIR)/debian/tmp/usr/lib/Slicer3/Modules/SlicerDaemon/Tcl/slicerget.tcl
chmod +x $(CURDIR)/debian/tmp/usr/lib/Slicer3/Modules/SlicerDaemon/Tcl/slicerput.tcl
chmod +x $(CURDIR)/debian/tmp/usr/lib/Slicer3/Modules/SlicerDaemon/Tcl/tracker/tracker.tcl
chmod +x $(CURDIR)/debian/tmp/usr/lib/Slicer3/SlicerBaseGUI/Tcl/ExternalProgress.tcl
chmod +x $(CURDIR)/debian/tmp/usr/lib/Slicer3/launch.tcl
chmod +x $(CURDIR)/debian/tmp/usr/share/FreeSurfer/Testing/fips2mrml.tcl
- chmod +x $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/ChangeTracker/Simulation/create_artificial_growth_deformation.sh
+# chmod +x $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/ChangeTracker/Simulation/create_artificial_growth_deformation.sh
chmod +x $(CURDIR)/debian/tmp/usr/share/Slicer3/Modules/QueryAtlas/Tcl/QueryAtlasFips2Mrml.tcl
chmod -x $(CURDIR)/Utilities/Launcher/3DSlicerLogoICOimages/3DSlicerLogo-DesktopIcon-48x48x256.png
- dh_install --sourcedir=$(CURDIR)/debian/tmp --fail-missing
+ dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
touch $@
@@ -155,7 +161,7 @@
dh_fixperms -a
dh_makeshlibs -a -plibslicer3
dh_installdeb -a
- dh_shlibdeps -a -l $(CURDIR)/debian/tmp/usr/lib:$(CURDIR)/debian/tmp/usr/lib/Slicer3:$(CURDIR)/debian/tmp/usr/lib/Slicer3/Modules
+ dh_shlibdeps -a -l $(CURDIR)/debian/tmp/usr/lib:$(CURDIR)/debian/tmp/usr/lib/Slicer3:$(CURDIR)/debian/tmp/usr/lib/Slicer3/Modules:$(CURDIR)/debian/tmp/usr/lib/Slicer3/Plugins
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a -- -Z bzip2
Modified: packages/slicer/trunk/debian/slicer.install
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/slicer.install?rev=37380&op=diff
==============================================================================
--- packages/slicer/trunk/debian/slicer.install (original)
+++ packages/slicer/trunk/debian/slicer.install Sat Feb 19 23:01:00 2011
@@ -1,72 +1,137 @@
-usr/lib/Slicer3/Slicer3Version.txt
-usr/lib/Slicer3/Modules/Editor
-usr/lib/Slicer3/Modules/SlicerDaemon
-usr/lib/Slicer3/Modules/ScriptedModuleExample
-usr/lib/Slicer3/Modules/ClipModel
-usr/lib/Slicer3/Modules/ModelIntoLabelVolume
-usr/lib/Slicer3/SlicerBaseGUI
-usr/lib/Slicer3/Plugins/ExtractSkeleton
-usr/lib/Slicer3/Plugins/Cast
-usr/lib/Slicer3/Plugins/ResampleDTI
-usr/lib/Slicer3/Plugins/ExecutionModelTour
-usr/lib/Slicer3/Plugins/DemonsRegistration
-usr/lib/Slicer3/Plugins/VotingBinaryHoleFillingImageFilter
-usr/lib/Slicer3/Plugins/ModelMaker
-usr/lib/Slicer3/Plugins/DiffusionTensorEstimation
-usr/lib/Slicer3/Plugins/Seeding
-usr/lib/Slicer3/Plugins/OtsuThresholdImageFilter
-usr/lib/Slicer3/Plugins/jointLMMSE
-usr/lib/Slicer3/Plugins/OrientImage
-usr/lib/Slicer3/Plugins/Subtract
-usr/lib/Slicer3/Plugins/ResampleVolume
-usr/lib/Slicer3/Plugins/RigidRegistration
-usr/lib/Slicer3/Plugins/dwiNoiseFilter
-usr/lib/Slicer3/Plugins/CurvatureAnisotropicDiffusion
-usr/lib/Slicer3/Plugins/ZeroCrossingBasedEdgeDetectionImageFilter
-usr/lib/Slicer3/Plugins/ConfidenceConnected
-usr/lib/Slicer3/Plugins/OtsuThresholdSegmentation
-usr/lib/Slicer3/Plugins/SparseFieldLevelSetContour
-usr/lib/Slicer3/Plugins/ResampleVolume2
-usr/lib/Slicer3/Plugins/EMSegmentCommandLine
-usr/lib/Slicer3/Plugins/Add
-usr/lib/Slicer3/Plugins/ImageReadDicomWrite
-usr/lib/Slicer3/Plugins/AffineRegistration
-usr/lib/Slicer3/Plugins/LabelMapSmoothing
-usr/lib/Slicer3/Plugins/Realign
-usr/lib/Slicer3/Plugins/GaussianBlurImageFilter
-usr/lib/Slicer3/Plugins/GrayscaleFillHoleImageFilter
-usr/lib/Slicer3/Plugins/DiffusionTensorMathematics
-usr/lib/Slicer3/Plugins/EMSegmentCommandLine_GUIVersion
-usr/lib/Slicer3/Plugins/MedianImageFilter
-usr/lib/Slicer3/Plugins/GradientAnisotropicDiffusion
-usr/lib/Slicer3/Plugins/GrayscaleGrindPeakImageFilter
-usr/lib/Slicer3/Plugins/HistogramMatching
-usr/lib/Slicer3/Plugins/GrayscaleModelMaker
-usr/lib/Slicer3/Plugins/LinearRegistration
-usr/lib/Slicer3/Plugins/Threshold
-usr/lib/Slicer3/Plugins/BSplineDeformableRegistration
-usr/lib/Slicer3/Plugins/FreesurferSurfaceSectionExtraction
-usr/lib/Slicer3/Plugins/ImageLabelCombine
-usr/lib/Slicer3/Plugins/dwiUNLM
-usr/lib/Slicer3/Plugins/DownloadSlicerTutorials
-usr/bin/DetectGrowthSegmentation
-usr/bin/applyDeformationITK
-usr/bin/GenerateCLP
-usr/bin/Slicer3-real usr/lib/Slicer3
-usr/bin/ChangeTrackerCommandLine
-usr/bin/GenerateLMLauncher
-usr/bin/DetectGrowth
-usr/bin/Slicer3 usr/lib/Slicer3
-usr/bin/GenerateLM
-usr/bin/GenerateCLPLauncher
-usr/lib/Slicer3/launch.tcl
-usr/lib/Qdec/vtkFreeSurferReaders.tcl
-usr/lib/Slicer3/Modules/FetchMI/Tcl/FetchMIXMLUtilities.tcl
-usr/lib/Slicer3/Modules/lib*.so.*
-usr/lib/Slicer3/lib*.so
-usr/lib/Slicer3/Modules/lib*.so
-../../Utilities/Launcher/3DSlicerLogoICOimages/3DSlicerLogo-DesktopIcon-48x48x256.png usr/share/pixmaps
-../../debian/slicer.desktop usr/share/applications
+../../debian/gdcm.dic usr/lib/Slicer3/gdcm/Dicts
+../../debian/Slicer3-launcher usr/bin
../../debian/slicer3 usr/bin
../../debian/Slicer3 usr/bin
-../../debian/gdcm.dic usr/lib/Slicer3/gdcm/Dicts
+../../debian/slicer.desktop usr/share/applications
+usr/bin/GenerateCLP
+usr/bin/GenerateCLPLauncher
+usr/bin/GenerateLM
+usr/bin/GenerateLMLauncher
+usr/bin/Slicer3
+usr/bin/Slicer3-real
+#usr/lib/Qdec/vtkFreeSurferReaders.tcl
+usr/lib/Slicer3/launch.tcl
+usr/lib/Slicer3/lib*.so
+usr/lib/Slicer3/Modules/ClipModel
+usr/lib/Slicer3/Modules/CropVolume/CropVolumeGUI.tcl
+usr/lib/Slicer3/Modules/CropVolume/CropVolumeLogic.tcl
+usr/lib/Slicer3/Modules/CropVolume/CropVolumeNode.tcl
+usr/lib/Slicer3/Modules/CropVolume/CropVolume.tcl
+usr/lib/Slicer3/Modules/CropVolume/pkgIndex.tcl
+usr/lib/Slicer3/Modules/DiffusionWelcome/DiffusionWelcomeGUI.py
+usr/lib/Slicer3/Modules/DiffusionWelcome/__init__.py
+#usr/lib/Slicer3/Modules/DistanceTransformModel
+usr/lib/Slicer3/Modules/Editor
+usr/lib/Slicer3/Modules/Endoscopy/EndoscopyGUI.py
+usr/lib/Slicer3/Modules/Endoscopy/__init__.py
+#usr/lib/Slicer3/Modules/ExtractSubvolume/ExtractSubvolumeGUI.py
+#usr/lib/Slicer3/Modules/ExtractSubvolume/__init__.py
+#usr/lib/Slicer3/Modules/ExtractSubvolumeROI
+usr/lib/Slicer3/Modules/FastMarchingSegmentation
+usr/lib/Slicer3/Modules/FetchMI/Tcl/FetchMIXMLUtilities.tcl
+usr/lib/Slicer3/Modules/lib*.so
+usr/lib/Slicer3/Modules/lib*.so.*
+usr/lib/Slicer3/Modules/ModelIntoLabelVolume
+usr/lib/Slicer3/Modules/RegistrationWelcome/__init__.py
+usr/lib/Slicer3/Modules/RegistrationWelcome/RegistrationWelcomeGUI.py
+usr/lib/Slicer3/Modules/ScriptedModuleExample
+usr/lib/Slicer3/Modules/SegmentationWelcome/__init__.py
+usr/lib/Slicer3/Modules/SegmentationWelcome/SegmentationWelcomeGUI.py
+usr/lib/Slicer3/Modules/SlicerDaemon
+usr/lib/Slicer3/Plugins/Add
+usr/lib/Slicer3/Plugins/AffineRegistration
+usr/lib/Slicer3/Plugins/BinarizeScalarValues.py
+usr/lib/Slicer3/Plugins/BSplineDeformableRegistration
+usr/lib/Slicer3/Plugins/Cast
+usr/lib/Slicer3/Plugins/ConfidenceConnected
+usr/lib/Slicer3/Plugins/ConvertFiducialToLabelMap.py
+usr/lib/Slicer3/Plugins/ConvertVolumeToArray.py
+usr/lib/Slicer3/Plugins/CreateROIPerLabel.py
+usr/lib/Slicer3/Plugins/CurvatureAnisotropicDiffusion
+#usr/lib/Slicer3/Plugins/DemonsRegistration
+usr/lib/Slicer3/Plugins/DiffusionTensorEstimation
+usr/lib/Slicer3/Plugins/DiffusionTensorMathematics
+usr/lib/Slicer3/Plugins/DownloadSlicerTutorials
+usr/lib/Slicer3/Plugins/dwiNoiseFilter
+usr/lib/Slicer3/Plugins/dwiUNLM
+#usr/lib/Slicer3/Plugins/EMSegmentCommandLine
+usr/lib/Slicer3/Plugins/EMSegmentCommandLine
+#usr/lib/Slicer3/Plugins/EMSegmentCommandLine_GUIVersion
+usr/lib/Slicer3/Plugins/ExecutionModelTour
+usr/lib/Slicer3/Plugins/ExplodeVolumeTransform.py
+usr/lib/Slicer3/Plugins/ExtractSkeleton
+#usr/lib/Slicer3/Plugins/FreesurferSurfaceSectionExtraction
+usr/lib/Slicer3/Plugins/GaussianBlurImageFilter
+usr/lib/Slicer3/Plugins/GradientAnisotropicDiffusion
+usr/lib/Slicer3/Plugins/GrayscaleFillHoleImageFilter
+usr/lib/Slicer3/Plugins/GrayscaleGrindPeakImageFilter
+usr/lib/Slicer3/Plugins/GrayscaleModelMaker
+usr/lib/Slicer3/Plugins/HistogramMatching
+usr/lib/Slicer3/Plugins/ImageLabelCombine
+usr/lib/Slicer3/Plugins/ImageReadDicomWrite
+usr/lib/Slicer3/Plugins/jointLMMSE
+usr/lib/Slicer3/Plugins/LabelMapSmoothing
+usr/lib/Slicer3/Plugins/LinearRegistration
+usr/lib/Slicer3/Plugins/LoadVolumeFromArray.py
+usr/lib/Slicer3/Plugins/Mask
+usr/lib/Slicer3/Plugins/MedianImageFilter
+usr/lib/Slicer3/Plugins/MergeModels
+usr/lib/Slicer3/Plugins/ModelMaker
+usr/lib/Slicer3/Plugins/Multiply
+usr/lib/Slicer3/Plugins/NumpyScript.py
+usr/lib/Slicer3/Plugins/OrientImage
+usr/lib/Slicer3/Plugins/OtsuThresholdImageFilter
+usr/lib/Slicer3/Plugins/OtsuThresholdSegmentation
+usr/lib/Slicer3/Plugins/PythonScript.py
+usr/lib/Slicer3/Plugins/Realign
+usr/lib/Slicer3/Plugins/RecenterMaskToDWI.py
+usr/lib/Slicer3/Plugins/ResampleDTI
+usr/lib/Slicer3/Plugins/ResampleVolume
+usr/lib/Slicer3/Plugins/ResampleVolume2
+usr/lib/Slicer3/Plugins/RigidRegistration
+usr/lib/Slicer3/Plugins/ROISelect
+usr/lib/Slicer3/Plugins/Seeding
+usr/lib/Slicer3/Plugins/SFLSRobustStat3DTest
+usr/lib/Slicer3/Plugins/ShiftDWIValues.py
+usr/lib/Slicer3/Plugins/SliceDWIPerVolume.py
+usr/lib/Slicer3/Plugins/SparseFieldLevelSetContour
+usr/lib/Slicer3/Plugins/StochasticTractoGraphyGenerator.py
+usr/lib/Slicer3/Plugins/StochasticTractoGraphyGeneratorWithLabels.py
+usr/lib/Slicer3/Plugins/StochasticTractography.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServer/cmpV.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServer/dispV.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/AnalyzeData.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/autoSlicerTracto2regions.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/autoSlicerTracto2regionsWithMask.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/autoTracto2regions.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/autoTracto2regionsWithMask.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/cmpV.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/dispV.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/ModifyHeader.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/nrrd.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/slicerd.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/smooth.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/StochasticTractoGraphyClusterFiles.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/StochasticTractoGraphyClusterSlicerDaemonFiles.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/TensorEval2C.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/TrackFiber4C.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServerMP/vectors.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServer/nrrd.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServer/PyPipelineServer.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServer/slicerd.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServer/smooth.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServer/TensorEval2.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServer/TensorEval.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServer/TrackFiber4.py
+usr/lib/Slicer3/Plugins/StochasticTractographyServer/vectors.py
+usr/lib/Slicer3/Plugins/Subtract
+usr/lib/Slicer3/Plugins/SurfaceConnectivity.py
+usr/lib/Slicer3/Plugins/SurfaceICPRegistration.py
+usr/lib/Slicer3/Plugins/SurfaceToolbox.py
+usr/lib/Slicer3/Plugins/Threshold
+#usr/lib/Slicer3/Plugins/UtahBSplineDeformableRegistration
+usr/lib/Slicer3/Plugins/VotingBinaryHoleFillingImageFilter
+#usr/lib/Slicer3/Plugins/ZeroCrossingBasedEdgeDetectionImageFilter
+usr/lib/Slicer3/Slicer3Version.txt
+usr/lib/Slicer3/SlicerBaseGUI
+../../Utilities/Launcher/3DSlicerLogoICOimages/3DSlicerLogo-DesktopIcon-48x48x256.png usr/share/pixmaps
More information about the debian-science-commits
mailing list