r35842 - in /packages/slicer/trunk/debian: README.source changelog control get-orig-source patches/50_all_changes.dpatch rules slicer.install slicer3
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Mon Sep 14 15:44:48 UTC 2009
Author: domibel-guest
Date: Mon Sep 14 15:44:47 2009
New Revision: 35842
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35842
Log:
switch to Tcl/Tk 8.5
Added:
packages/slicer/trunk/debian/README.source
Modified:
packages/slicer/trunk/debian/changelog
packages/slicer/trunk/debian/control
packages/slicer/trunk/debian/get-orig-source
packages/slicer/trunk/debian/patches/50_all_changes.dpatch
packages/slicer/trunk/debian/rules
packages/slicer/trunk/debian/slicer.install
packages/slicer/trunk/debian/slicer3
Added: packages/slicer/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/README.source?rev=35842&op=file
==============================================================================
--- packages/slicer/trunk/debian/README.source (added)
+++ packages/slicer/trunk/debian/README.source Mon Sep 14 15:44:47 2009
@@ -1,0 +1,1 @@
+adding soname ...
Modified: packages/slicer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/changelog?rev=35842&op=diff
==============================================================================
--- packages/slicer/trunk/debian/changelog (original)
+++ packages/slicer/trunk/debian/changelog Mon Sep 14 15:44:47 2009
@@ -1,3 +1,18 @@
+slicer (3.4.0~svn10438-1) experimental; urgency=low
+
+ * switch to Tcl/Tk 8.5
+ * 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
+
slicer (3.4.0~svn10133-1) experimental; urgency=low
* Add libgdcm2-dev dependency
Modified: packages/slicer/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/control?rev=35842&op=diff
==============================================================================
--- packages/slicer/trunk/debian/control (original)
+++ packages/slicer/trunk/debian/control Mon Sep 14 15:44:47 2009
@@ -3,12 +3,12 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
-Build-Depends: debhelper (>= 7), dpatch, cmake, tcl8.4-dev, tk8.4-dev, libpng-dev, libjpeg-dev,
+Build-Depends: debhelper (>= 7), dpatch, cmake, tcl8.5-dev, tk8.5-dev, libpng-dev, libjpeg-dev,
libtiff-dev, libexpat1-dev, libinsighttoolkit3-dev, libkwwidgets1-dev, libcurl4-openssl-dev,
- libfreetype6-dev, libxext-dev, libvtk5-dev, libteem1-dev, libopenigtlink1-dev, chrpath,
+ libfreetype6-dev, libxext-dev, libvtk5-dev, libteem1-dev, libopenigtlink1-dev,
uuid-dev, libbz2-dev, libxft-dev, libtclap-dev, libgdcm2-dev, libfftw3-dev, libopenjpeg-dev
Build-Depends-Indep: doxygen, graphviz
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
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
@@ -18,7 +18,7 @@
Package: slicer
Architecture: any
Depends: libslicer3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
- slicer-data, itcl3, iwidgets4, tcllib, tcl8.4-kwwidgets
+ slicer-data, itcl3, iwidgets4, tcllib, tcl8.5-kwwidgets
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
@@ -66,7 +66,7 @@
Package: slicer-data
Section: doc
Architecture: all
-Depends: ${misc:Depends}, tk8.4 | wish
+Depends: ${misc:Depends}, tk8.5 | wish
Description: software package for visualization and image analysis - share
Slicer is an application for computer scientists and clinical researchers. The
platform provides functionality for segmentation, registration and
Modified: packages/slicer/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/get-orig-source?rev=35842&op=diff
==============================================================================
--- packages/slicer/trunk/debian/get-orig-source (original)
+++ packages/slicer/trunk/debian/get-orig-source Mon Sep 14 15:44:47 2009
@@ -19,7 +19,7 @@
FOLDER=${PACKAGE}-${VERSION}
-
+#svn checkout --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/branches/Slicer-3-4 ${FOLDER}
svn export --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/branches/Slicer-3-4 ${FOLDER}
cd ${FOLDER}
Modified: packages/slicer/trunk/debian/patches/50_all_changes.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/patches/50_all_changes.dpatch?rev=35842&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.dpatch (original)
+++ packages/slicer/trunk/debian/patches/50_all_changes.dpatch Mon Sep 14 15:44:47 2009
@@ -5,10 +5,29 @@
## DP: This patch adds soname version numbers
@DPATCH@
-diff -urNad slicer-3.4.0~svn10133~/Applications/CLI/CMakeLists.txt slicer-3.4.0~svn10133/Applications/CLI/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Applications/CLI/CMakeLists.txt 2009-07-22 09:12:49.000000000 -0400
-+++ slicer-3.4.0~svn10133/Applications/CLI/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
-@@ -269,19 +269,19 @@
+diff -urNad slicer-3.4.0~svn10438~/Applications/CLI/AffineRegistration.cxx slicer-3.4.0~svn10438/Applications/CLI/AffineRegistration.cxx
+--- slicer-3.4.0~svn10438~/Applications/CLI/AffineRegistration.cxx 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/CLI/AffineRegistration.cxx 2009-09-13 15:35:37.000000000 -0400
+@@ -539,6 +539,7 @@
+ case itk::ImageIOBase::SHORT:
+ return DoIt( argc, argv, static_cast<short>(0));
+ break;
++/*
+ case itk::ImageIOBase::USHORT:
+ case itk::ImageIOBase::INT:
+ return DoIt( argc, argv, static_cast<int>(0));
+@@ -556,6 +557,7 @@
+ case itk::ImageIOBase::DOUBLE:
+ return DoIt( argc, argv, static_cast<float>(0));
+ break;
++*/
+ case itk::ImageIOBase::UNKNOWNCOMPONENTTYPE:
+ default:
+ std::cout << "unknown component type" << std::endl;
+diff -urNad slicer-3.4.0~svn10438~/Applications/CLI/CMakeLists.txt slicer-3.4.0~svn10438/Applications/CLI/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Applications/CLI/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/CLI/CMakeLists.txt 2009-09-13 15:35:37.000000000 -0400
+@@ -269,34 +269,6 @@
target_link_libraries (${CLP}Lib ITKIO ITKBasicFilters)
#####################
@@ -25,23 +44,25 @@
-set_target_properties (${CLP}Lib PROPERTIES COMPILE_FLAGS "-Dmain=ModuleEntryPoint")
-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)
-
-@@ -569,11 +569,11 @@
+-#####################
+-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)
+@@ -569,11 +541,11 @@
else ( ${ITK_VERSION_MAJOR} GREATER 3 )
@@ -55,7 +76,7 @@
if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
if ( ITK_USE_OPTIMIZED_REGISTRATION_METHODS )
-@@ -585,7 +585,7 @@
+@@ -585,7 +557,7 @@
message ("RegisterImagesModule requires ITK version 3.8 or higher")
endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
@@ -64,195 +85,20 @@
endif ( ${ITK_VERSION_MAJOR} GREATER 3 )
-@@ -661,8 +661,8 @@
+@@ -661,10 +633,6 @@
CheckerBoardLib
GaussianBlurImageFilter
GaussianBlurImageFilterLib
- DicomToNrrdConverter
- DicomToNrrdConverterLib
-+# DicomToNrrdConverter
-+# DicomToNrrdConverterLib
- DWIDicomLoad
- DWIDicomLoadLib
+- DWIDicomLoad
+- DWIDicomLoadLib
FreesurferSurfaceSectionExtraction
-diff -urNad slicer-3.4.0~svn10133~/Applications/CLI/DWIDicomLoad.cxx slicer-3.4.0~svn10133/Applications/CLI/DWIDicomLoad.cxx
---- slicer-3.4.0~svn10133~/Applications/CLI/DWIDicomLoad.cxx 2009-06-10 17:43:25.000000000 -0400
-+++ slicer-3.4.0~svn10133/Applications/CLI/DWIDicomLoad.cxx 2009-08-06 15:54:35.000000000 -0400
-@@ -70,7 +70,7 @@
- #include "vnl/algo/vnl_svd.h"
-
- #include "itkVectorImage.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
-@@ -86,17 +86,17 @@
-
-
- // relevant GE private tags
--const gdcm::DictEntry GEDictBValue( 0x0043, 0x1039, "IS", "1", "B Value of diffusion weighting" );
--const gdcm::DictEntry GEDictXGradient( 0x0019, 0x10bb, "DS", "1", "X component of gradient direction" );
--const gdcm::DictEntry GEDictYGradient( 0x0019, 0x10bc, "DS", "1", "Y component of gradient direction" );
--const gdcm::DictEntry GEDictZGradient( 0x0019, 0x10bd, "DS", "1", "Z component of gradient direction" );
-+//const gdcm::DictEntry GEDictBValue( 0x0043, 0x1039, "IS", "1", "B Value of diffusion weighting" );
-+//const gdcm::DictEntry GEDictXGradient( 0x0019, 0x10bb, "DS", "1", "X component of gradient direction" );
-+//const gdcm::DictEntry GEDictYGradient( 0x0019, 0x10bc, "DS", "1", "Y component of gradient direction" );
-+//const gdcm::DictEntry GEDictZGradient( 0x0019, 0x10bd, "DS", "1", "Z component of gradient direction" );
-
- // relevant Siemens private tags
--const gdcm::DictEntry SiemensMosiacParameters( 0x0051, 0x100b, "IS", "1", "Mosiac Matrix Size" );
--const gdcm::DictEntry SiemensDictNMosiac( 0x0019, 0x100a, "US", "1", "Number of Images In Mosaic" );
--const gdcm::DictEntry SiemensDictBValue( 0x0019, 0x100c, "IS", "1", "B Value of diffusion weighting" );
--const gdcm::DictEntry SiemensDictDiffusionDirection( 0x0019, 0x100e, "FD", "3", "Diffusion Gradient Direction" );
--const gdcm::DictEntry SiemensDictDiffusionMatrix( 0x0019, 0x1027, "FD", "6", "Diffusion Matrix" );
-+//const gdcm::DictEntry SiemensMosiacParameters( 0x0051, 0x100b, "IS", "1", "Mosiac Matrix Size" );
-+//const gdcm::DictEntry SiemensDictNMosiac( 0x0019, 0x100a, "US", "1", "Number of Images In Mosaic" );
-+//const gdcm::DictEntry SiemensDictBValue( 0x0019, 0x100c, "IS", "1", "B Value of diffusion weighting" );
-+//const gdcm::DictEntry SiemensDictDiffusionDirection( 0x0019, 0x100e, "FD", "3", "Diffusion Gradient Direction" );
-+//const gdcm::DictEntry SiemensDictDiffusionMatrix( 0x0019, 0x1027, "FD", "6", "Diffusion Matrix" );
-
- // add relevant private tags from other vendors
-
-@@ -163,19 +163,19 @@
- if ( vendor.find("GE") != std::string::npos )
- {
- // for GE data
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictBValue);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictXGradient);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictYGradient);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictZGradient);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictBValue);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictXGradient);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictYGradient);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictZGradient);
- }
- else if( vendor.find("SIEMENS") != std::string::npos )
- {
- // for Siemens data
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensMosiacParameters);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictNMosiac);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictBValue);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictDiffusionDirection);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictDiffusionMatrix);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensMosiacParameters);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictNMosiac);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictBValue);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictDiffusionDirection);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictDiffusionMatrix);
- }
- else if( vendor.find("PHILIPS") != std::string::npos )
- {
-diff -urNad slicer-3.4.0~svn10133~/Applications/CLI/DicomToNrrdConverter.cxx slicer-3.4.0~svn10133/Applications/CLI/DicomToNrrdConverter.cxx
---- slicer-3.4.0~svn10133~/Applications/CLI/DicomToNrrdConverter.cxx 2009-06-10 17:43:25.000000000 -0400
-+++ slicer-3.4.0~svn10133/Applications/CLI/DicomToNrrdConverter.cxx 2009-08-06 15:54:35.000000000 -0400
-@@ -67,11 +67,11 @@
- #include "vnl/algo/vnl_svd.h"
-
- #include "itkVectorImage.h"
--#include "gdcmDictSet.h" // access to dictionary
-+//#include "gdcmDictSet.h" // access to dictionary
- #include "gdcmDict.h" // access to dictionary
- #include "gdcmFile.h" // access to dictionary
--#include "gdcmDocEntry.h" //internal of gdcm
--#include "gdcmBinEntry.h" //internal of gdcm
-+//#include "gdcmDocEntry.h" //internal of gdcm
-+//#include "gdcmBinEntry.h" //internal of gdcm
- #include "gdcmDictEntry.h" // access to dictionary
- #include "gdcmGlobal.h" // access to dictionary
-
-@@ -89,25 +89,25 @@
- namespace {
-
- // relevant GE private tags
--const gdcm::DictEntry GEDictBValue( 0x0043, 0x1039, "IS", "1", "B Value of diffusion weighting" );
--const gdcm::DictEntry GEDictXGradient( 0x0019, 0x10bb, "DS", "1", "X component of gradient direction" );
--const gdcm::DictEntry GEDictYGradient( 0x0019, 0x10bc, "DS", "1", "Y component of gradient direction" );
--const gdcm::DictEntry GEDictZGradient( 0x0019, 0x10bd, "DS", "1", "Z component of gradient direction" );
-+//const gdcm::DictEntry GEDictBValue( 0x0043, 0x1039, "IS", "1", "B Value of diffusion weighting" );
-+//const gdcm::DictEntry GEDictXGradient( 0x0019, 0x10bb, "DS", "1", "X component of gradient direction" );
-+//const gdcm::DictEntry GEDictYGradient( 0x0019, 0x10bc, "DS", "1", "Y component of gradient direction" );
-+//const gdcm::DictEntry GEDictZGradient( 0x0019, 0x10bd, "DS", "1", "Z component of gradient direction" );
-
- // relevant Siemens private tags
--const gdcm::DictEntry SiemensMosiacParameters( 0x0051, 0x100b, "IS", "1", "Mosiac Matrix Size" );
--const gdcm::DictEntry SiemensDictNMosiac( 0x0019, 0x100a, "US", "1", "Number of Images In Mosaic" );
--const gdcm::DictEntry SiemensDictBValue( 0x0019, 0x100c, "IS", "1", "B Value of diffusion weighting" );
--const gdcm::DictEntry SiemensDictDiffusionDirection( 0x0019, 0x100e, "FD", "3", "Diffusion Gradient Direction" );
--const gdcm::DictEntry SiemensDictDiffusionMatrix( 0x0019, 0x1027, "FD", "6", "Diffusion Matrix" );
--const gdcm::DictEntry SiemensDictShadowInfo( 0x0029, 0x1010, "OB", "1", "Siemens DWI Info" );
-+//const gdcm::DictEntry SiemensMosiacParameters( 0x0051, 0x100b, "IS", "1", "Mosiac Matrix Size" );
-+//const gdcm::DictEntry SiemensDictNMosiac( 0x0019, 0x100a, "US", "1", "Number of Images In Mosaic" );
-+//const gdcm::DictEntry SiemensDictBValue( 0x0019, 0x100c, "IS", "1", "B Value of diffusion weighting" );
-+//const gdcm::DictEntry SiemensDictDiffusionDirection( 0x0019, 0x100e, "FD", "3", "Diffusion Gradient Direction" );
-+//const gdcm::DictEntry SiemensDictDiffusionMatrix( 0x0019, 0x1027, "FD", "6", "Diffusion Matrix" );
-+//const gdcm::DictEntry SiemensDictShadowInfo( 0x0029, 0x1010, "OB", "1", "Siemens DWI Info" );
-
- // relevant Philips private tags
--const gdcm::DictEntry PhilipsDictBValue( 0x2001, 0x1003, "FL", "1", "B Value of diffusion weighting" );
--const gdcm::DictEntry PhilipsDictDiffusionDirection( 0x2001, 0x1004, "CS", "1", "Diffusion Gradient Direction" );
--const gdcm::DictEntry PhilipsDictDiffusionDirectionRL( 0x2005, 0x10b0, "FL", "4", "Diffusion Direction R/L" );
--const gdcm::DictEntry PhilipsDictDiffusionDirectionAP( 0x2005, 0x10b1, "FL", "4", "Diffusion Direction A/P" );
--const gdcm::DictEntry PhilipsDictDiffusionDirectionFH( 0x2005, 0x10b2, "FL", "4", "Diffusion Direction F/H" );
-+//const gdcm::DictEntry PhilipsDictBValue( 0x2001, 0x1003, "FL", "1", "B Value of diffusion weighting" );
-+//const gdcm::DictEntry PhilipsDictDiffusionDirection( 0x2001, 0x1004, "CS", "1", "Diffusion Gradient Direction" );
-+//const gdcm::DictEntry PhilipsDictDiffusionDirectionRL( 0x2005, 0x10b0, "FL", "4", "Diffusion Direction R/L" );
-+//const gdcm::DictEntry PhilipsDictDiffusionDirectionAP( 0x2005, 0x10b1, "FL", "4", "Diffusion Direction A/P" );
-+//const gdcm::DictEntry PhilipsDictDiffusionDirectionFH( 0x2005, 0x10b2, "FL", "4", "Diffusion Direction F/H" );
-
- // add relevant private tags from other vendors
-
-@@ -302,20 +302,20 @@
- if ( vendor.find("GE") != std::string::npos )
- {
- // for GE data
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictBValue);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictXGradient);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictYGradient);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictZGradient);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictBValue);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictXGradient);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictYGradient);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(GEDictZGradient);
- }
- else if( vendor.find("SIEMENS") != std::string::npos )
- {
- // for Siemens data
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensMosiacParameters);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictNMosiac);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictBValue);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictDiffusionDirection);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictDiffusionMatrix);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictShadowInfo);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensMosiacParameters);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictNMosiac);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictBValue);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictDiffusionDirection);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictDiffusionMatrix);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(SiemensDictShadowInfo);
-
- if ( ImageType.find("MOSAIC") != std::string::npos )
- {
-@@ -332,11 +332,11 @@
- ( vendor.find("Philips") != std::string::npos ) )
- {
- // for philips data
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(PhilipsDictBValue);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(PhilipsDictDiffusionDirection);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(PhilipsDictDiffusionDirectionRL);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(PhilipsDictDiffusionDirectionAP);
-- gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(PhilipsDictDiffusionDirectionFH);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(PhilipsDictBValue);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(PhilipsDictDiffusionDirection);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(PhilipsDictDiffusionDirectionRL);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(PhilipsDictDiffusionDirectionAP);
-+// gdcm::Global::GetDicts()->GetDefaultPubDict()->AddEntry(PhilipsDictDiffusionDirectionFH);
- }
- else
- {
-diff -urNad slicer-3.4.0~svn10133~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt slicer-3.4.0~svn10133/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2008-06-24 18:14:09.000000000 -0400
-+++ slicer-3.4.0~svn10133/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+ ZeroCrossingBasedEdgeDetectionImageFilter
+ ZeroCrossingBasedEdgeDetectionImageFilterLib
+diff -urNad slicer-3.4.0~svn10438~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-09-13 15:35:37.000000000 -0400
@@ -18,8 +18,8 @@
#
@@ -282,9 +128,9 @@
#
# Move exec and module to where Slicer can find them
-diff -urNad slicer-3.4.0~svn10133~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx slicer-3.4.0~svn10133/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
---- slicer-3.4.0~svn10133~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-04-10 13:33:12.000000000 -0400
-+++ slicer-3.4.0~svn10133/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
+--- slicer-3.4.0~svn10438~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-09-13 15:35:37.000000000 -0400
@@ -3,7 +3,7 @@
#endif
@@ -294,9 +140,9 @@
#include <itksys/SystemTools.hxx>
#include <itksys/Process.h>
#include <math.h>
-diff -urNad slicer-3.4.0~svn10133~/Applications/GUI/CMakeLists.txt slicer-3.4.0~svn10133/Applications/GUI/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Applications/GUI/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn10133/Applications/GUI/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Applications/GUI/CMakeLists.txt slicer-3.4.0~svn10438/Applications/GUI/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Applications/GUI/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/GUI/CMakeLists.txt 2009-09-13 15:35:37.000000000 -0400
@@ -45,7 +45,7 @@
set(Slicer3_FORWARD_PATH_BUILD
"\"${Slicer3_FORWARD_DIR_BUILD}\",\"${VTK_DIR}/bin\",\"${KWWidgets_RUNTIME_DIRS}\",\"${ITK_DIR}/bin\",\"${Teem_DIR}/bin\",\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\",\"${OPENGL_gl_LIBRARY_PATH}\"")
@@ -319,9 +165,9 @@
# --------------------------------------------------------------------------
# Include dirs
-diff -urNad slicer-3.4.0~svn10133~/Applications/GUI/Slicer3.cxx slicer-3.4.0~svn10133/Applications/GUI/Slicer3.cxx
---- slicer-3.4.0~svn10133~/Applications/GUI/Slicer3.cxx 2009-07-31 15:13:16.000000000 -0400
-+++ slicer-3.4.0~svn10133/Applications/GUI/Slicer3.cxx 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Applications/GUI/Slicer3.cxx slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx
+--- slicer-3.4.0~svn10438~/Applications/GUI/Slicer3.cxx 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Applications/GUI/Slicer3.cxx 2009-09-13 15:35:37.000000000 -0400
@@ -411,7 +411,7 @@
}
@@ -331,9 +177,9 @@
vtkKWApplication::PutEnv(const_cast <char *> (tclEnv.c_str()));
// ITK factories dir
-diff -urNad slicer-3.4.0~svn10133~/Base/CLI/CMakeLists.txt slicer-3.4.0~svn10133/Base/CLI/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Base/CLI/CMakeLists.txt 2008-05-20 03:31:33.000000000 -0400
-+++ slicer-3.4.0~svn10133/Base/CLI/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Base/CLI/CMakeLists.txt slicer-3.4.0~svn10438/Base/CLI/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Base/CLI/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Base/CLI/CMakeLists.txt 2009-09-13 15:35:37.000000000 -0400
@@ -58,6 +58,11 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} SlicerBaseCLI)
@@ -346,9 +192,9 @@
install(TARGETS SlicerBaseCLI
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.4.0~svn10133~/Base/GUI/CMakeLists.txt slicer-3.4.0~svn10133/Base/GUI/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Base/GUI/CMakeLists.txt 2009-03-16 11:34:28.000000000 -0400
-+++ slicer-3.4.0~svn10133/Base/GUI/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Base/GUI/CMakeLists.txt slicer-3.4.0~svn10438/Base/GUI/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Base/GUI/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Base/GUI/CMakeLists.txt 2009-09-13 15:35:40.000000000 -0400
@@ -177,6 +177,11 @@
RemoteIO
)
@@ -361,9 +207,9 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
-diff -urNad slicer-3.4.0~svn10133~/Base/Logic/CMakeLists.txt slicer-3.4.0~svn10133/Base/Logic/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Base/Logic/CMakeLists.txt 2008-11-05 14:25:28.000000000 -0500
-+++ slicer-3.4.0~svn10133/Base/Logic/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Base/Logic/CMakeLists.txt slicer-3.4.0~svn10438/Base/Logic/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Base/Logic/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Base/Logic/CMakeLists.txt 2009-09-13 15:35:41.000000000 -0400
@@ -115,6 +115,11 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
@@ -376,9 +222,9 @@
install(TARGETS ${lib_name}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.4.0~svn10133~/CMakeLists.txt slicer-3.4.0~svn10133/CMakeLists.txt
---- slicer-3.4.0~svn10133~/CMakeLists.txt 2009-04-22 19:00:01.000000000 -0400
-+++ slicer-3.4.0~svn10133/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/CMakeLists.txt slicer-3.4.0~svn10438/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/CMakeLists.txt 2009-09-13 15:35:41.000000000 -0400
@@ -27,6 +27,11 @@
set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
@@ -430,9 +276,17 @@
endif(Slicer3_USE_OPENIGTLINK)
#-----------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn10133~/Libs/CMakeLists.txt slicer-3.4.0~svn10133/Libs/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/CMakeLists.txt 2008-11-05 18:39:51.000000000 -0500
-+++ slicer-3.4.0~svn10133/Libs/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+@@ -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
+ )
+diff -urNad slicer-3.4.0~svn10438~/Libs/CMakeLists.txt slicer-3.4.0~svn10438/Libs/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/CMakeLists.txt 2009-09-13 15:35:41.000000000 -0400
@@ -1,7 +1,6 @@
project(SlicerLibs)
@@ -441,9 +295,9 @@
ModuleDescriptionParser
GenerateCLP
LoadableModule
-diff -urNad slicer-3.4.0~svn10133~/Libs/FreeSurfer/CMakeLists.txt slicer-3.4.0~svn10133/Libs/FreeSurfer/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/FreeSurfer/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/FreeSurfer/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/FreeSurfer/CMakeLists.txt slicer-3.4.0~svn10438/Libs/FreeSurfer/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/FreeSurfer/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/FreeSurfer/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -68,9 +68,14 @@
vtkIOTCL
)
@@ -460,9 +314,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/GenerateCLP/CMakeLists.txt slicer-3.4.0~svn10133/Libs/GenerateCLP/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/GenerateCLP/CMakeLists.txt 2008-05-27 18:36:34.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/GenerateCLP/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/GenerateCLP/CMakeLists.txt slicer-3.4.0~svn10438/Libs/GenerateCLP/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/GenerateCLP/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/GenerateCLP/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -11,10 +11,10 @@
include(${ModuleDescriptionParser_USE_FILE})
endif(ModuleDescriptionParser_FOUND)
@@ -478,9 +332,9 @@
find_package(ITK REQUIRED)
if(ITK_FOUND)
-diff -urNad slicer-3.4.0~svn10133~/Libs/GenerateCLP/UseGenerateCLP.cmake.in slicer-3.4.0~svn10133/Libs/GenerateCLP/UseGenerateCLP.cmake.in
---- slicer-3.4.0~svn10133~/Libs/GenerateCLP/UseGenerateCLP.cmake.in 2008-05-26 11:07:36.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/GenerateCLP/UseGenerateCLP.cmake.in 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/GenerateCLP/UseGenerateCLP.cmake.in slicer-3.4.0~svn10438/Libs/GenerateCLP/UseGenerateCLP.cmake.in
+--- slicer-3.4.0~svn10438~/Libs/GenerateCLP/UseGenerateCLP.cmake.in 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/GenerateCLP/UseGenerateCLP.cmake.in 2009-09-13 15:35:42.000000000 -0400
@@ -5,10 +5,10 @@
message(FATAL_ERROR "Cannot build without ITK. Please set ITK_DIR.")
endif(ITK_FOUND)
@@ -496,9 +350,9 @@
find_package(ModuleDescriptionParser REQUIRED)
if(ModuleDescriptionParser_FOUND)
-diff -urNad slicer-3.4.0~svn10133~/Libs/IGT/CMakeLists.txt slicer-3.4.0~svn10133/Libs/IGT/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/IGT/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/IGT/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/IGT/CMakeLists.txt slicer-3.4.0~svn10438/Libs/IGT/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/IGT/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/IGT/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -139,9 +139,14 @@
${TRACKING_INTERFACE_LIB}
)
@@ -515,9 +369,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/ITKCommandIO/CMakeLists.txt slicer-3.4.0~svn10133/Libs/ITKCommandIO/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/ITKCommandIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/ITKCommandIO/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/ITKCommandIO/CMakeLists.txt slicer-3.4.0~svn10438/Libs/ITKCommandIO/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/ITKCommandIO/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/ITKCommandIO/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -71,9 +71,14 @@
ITKIO
)
@@ -534,9 +388,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/LoadableModule/CMakeLists.txt slicer-3.4.0~svn10133/Libs/LoadableModule/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/LoadableModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn10133/Libs/LoadableModule/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/LoadableModule/CMakeLists.txt slicer-3.4.0~svn10438/Libs/LoadableModule/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/LoadableModule/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/LoadableModule/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -116,9 +116,14 @@
target_link_libraries(${lib_name} ${link_libs})
@@ -553,9 +407,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/MGHImageIO/CMakeLists.txt slicer-3.4.0~svn10133/Libs/MGHImageIO/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/MGHImageIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/MGHImageIO/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/MGHImageIO/CMakeLists.txt slicer-3.4.0~svn10438/Libs/MGHImageIO/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/MGHImageIO/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/MGHImageIO/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -59,9 +59,14 @@
ITKIO
)
@@ -572,9 +426,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/MRML/CMakeLists.txt slicer-3.4.0~svn10133/Libs/MRML/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/MRML/CMakeLists.txt 2009-02-27 17:28:47.000000000 -0500
-+++ slicer-3.4.0~svn10133/Libs/MRML/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/MRML/CMakeLists.txt slicer-3.4.0~svn10438/Libs/MRML/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/MRML/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/MRML/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -237,9 +237,14 @@
endif(MRML_USE_vtkTeem)
endif(MRML_USE_Teem)
@@ -591,9 +445,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/MRMLIDImageIO/CMakeLists.txt slicer-3.4.0~svn10133/Libs/MRMLIDImageIO/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/MRMLIDImageIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/MRMLIDImageIO/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/MRMLIDImageIO/CMakeLists.txt slicer-3.4.0~svn10438/Libs/MRMLIDImageIO/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/MRMLIDImageIO/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/MRMLIDImageIO/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -78,9 +78,14 @@
vtkImaging
)
@@ -610,9 +464,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/ModuleDescriptionParser/CMakeLists.txt slicer-3.4.0~svn10133/Libs/ModuleDescriptionParser/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn10133/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/ModuleDescriptionParser/CMakeLists.txt slicer-3.4.0~svn10438/Libs/ModuleDescriptionParser/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -120,9 +120,14 @@
target_link_libraries(${lib_name} ${link_libs})
@@ -629,9 +483,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/Qdec/CMakeLists.txt slicer-3.4.0~svn10133/Libs/Qdec/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/Qdec/CMakeLists.txt 2008-05-31 13:31:15.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/Qdec/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/Qdec/CMakeLists.txt slicer-3.4.0~svn10438/Libs/Qdec/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/Qdec/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/Qdec/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -76,9 +76,14 @@
# vtkIOTCL
)
@@ -648,9 +502,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/Qdec/QdecContrast.cpp slicer-3.4.0~svn10133/Libs/Qdec/QdecContrast.cpp
---- slicer-3.4.0~svn10133~/Libs/Qdec/QdecContrast.cpp 2009-05-19 18:25:04.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/Qdec/QdecContrast.cpp 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/Qdec/QdecContrast.cpp slicer-3.4.0~svn10438/Libs/Qdec/QdecContrast.cpp
+--- slicer-3.4.0~svn10438~/Libs/Qdec/QdecContrast.cpp 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/Qdec/QdecContrast.cpp 2009-09-13 15:35:42.000000000 -0400
@@ -16,6 +16,7 @@
#include <errno.h>
#include <sys/stat.h>
@@ -659,9 +513,9 @@
#include "QdecContrast.h"
-diff -urNad slicer-3.4.0~svn10133~/Libs/RemoteIO/CMakeLists.txt slicer-3.4.0~svn10133/Libs/RemoteIO/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/RemoteIO/CMakeLists.txt 2008-10-10 10:41:24.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/RemoteIO/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/RemoteIO/CMakeLists.txt slicer-3.4.0~svn10438/Libs/RemoteIO/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/RemoteIO/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/RemoteIO/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -11,8 +11,11 @@
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
@@ -697,9 +551,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.4.0~svn10133/Libs/RemoteIO/vtkHTTPHandler.h
---- slicer-3.4.0~svn10133~/Libs/RemoteIO/vtkHTTPHandler.h 2008-10-10 10:41:24.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/RemoteIO/vtkHTTPHandler.h 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.4.0~svn10438/Libs/RemoteIO/vtkHTTPHandler.h
+--- slicer-3.4.0~svn10438~/Libs/RemoteIO/vtkHTTPHandler.h 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/RemoteIO/vtkHTTPHandler.h 2009-09-13 15:35:42.000000000 -0400
@@ -5,7 +5,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -709,9 +563,9 @@
#include <vtkRemoteIOConfigure.h>
#include "vtkRemoteIO.h"
-diff -urNad slicer-3.4.0~svn10133~/Libs/SlicerIO/CMakeLists.txt slicer-3.4.0~svn10133/Libs/SlicerIO/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/SlicerIO/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/SlicerIO/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/SlicerIO/CMakeLists.txt slicer-3.4.0~svn10438/Libs/SlicerIO/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/SlicerIO/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/SlicerIO/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -48,7 +48,7 @@
install(TARGETS ${lib_name}
@@ -721,9 +575,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/vtkITK/CMakeLists.txt slicer-3.4.0~svn10133/Libs/vtkITK/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/vtkITK/CMakeLists.txt 2009-03-25 19:01:37.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/vtkITK/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/vtkITK/CMakeLists.txt slicer-3.4.0~svn10438/Libs/vtkITK/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/vtkITK/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/vtkITK/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -111,9 +111,14 @@
ITKDICOMParser
)
@@ -740,9 +594,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h slicer-3.4.0~svn10133/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
---- slicer-3.4.0~svn10133~/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2009-04-03 07:35:43.000000000 -0400
-+++ slicer-3.4.0~svn10133/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
+--- slicer-3.4.0~svn10438~/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2009-09-13 15:35:42.000000000 -0400
@@ -34,7 +34,7 @@
#include <string>
@@ -752,9 +606,9 @@
#include "gdcmDict.h" // access to dictionary
#include "gdcmDictEntry.h" // access to dictionary
#include "gdcmGlobal.h" // access to dictionary
-diff -urNad slicer-3.4.0~svn10133~/Libs/vtkTeem/CMakeLists.txt slicer-3.4.0~svn10133/Libs/vtkTeem/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Libs/vtkTeem/CMakeLists.txt 2008-11-05 18:39:51.000000000 -0500
-+++ slicer-3.4.0~svn10133/Libs/vtkTeem/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Libs/vtkTeem/CMakeLists.txt slicer-3.4.0~svn10438/Libs/vtkTeem/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Libs/vtkTeem/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Libs/vtkTeem/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -111,9 +111,14 @@
${Teem_LIBRARIES}
)
@@ -771,9 +625,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/CMakeLists.txt slicer-3.4.0~svn10133/Modules/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/CMakeLists.txt 2009-04-30 17:12:13.000000000 -0400
-+++ slicer-3.4.0~svn10133/Modules/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/CMakeLists.txt slicer-3.4.0~svn10438/Modules/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -74,7 +74,7 @@
subdirs(
OpenIGTLinkIF
@@ -783,9 +637,9 @@
)
endif(Slicer3_USE_OPENIGTLINK)
-diff -urNad slicer-3.4.0~svn10133~/Modules/ChangeTracker/CMakeLists.txt slicer-3.4.0~svn10133/Modules/ChangeTracker/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/ChangeTracker/CMakeLists.txt 2009-04-30 13:59:22.000000000 -0400
-+++ slicer-3.4.0~svn10133/Modules/ChangeTracker/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/ChangeTracker/CMakeLists.txt slicer-3.4.0~svn10438/Modules/ChangeTracker/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/ChangeTracker/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/ChangeTracker/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -40,8 +40,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -807,9 +661,9 @@
target_link_libraries(${lib_name}
${Slicer3_Libs_LIBRARIES}
${Slicer3_Base_LIBRARIES}
-diff -urNad slicer-3.4.0~svn10133~/Modules/CommandLineModule/CMakeLists.txt slicer-3.4.0~svn10133/Modules/CommandLineModule/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/CommandLineModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/CommandLineModule/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/CommandLineModule/CMakeLists.txt slicer-3.4.0~svn10438/Modules/CommandLineModule/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/CommandLineModule/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/CommandLineModule/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -831,9 +685,9 @@
# Python settings
if(Slicer3_USE_PYTHON)
-diff -urNad slicer-3.4.0~svn10133~/Modules/EMSegment/CMakeLists.txt slicer-3.4.0~svn10133/Modules/EMSegment/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/EMSegment/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn10133/Modules/EMSegment/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/EMSegment/CMakeLists.txt slicer-3.4.0~svn10438/Modules/EMSegment/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/EMSegment/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/EMSegment/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -44,8 +44,6 @@
"${CMAKE_CURRENT_SOURCE_DIR}/Registration/*.h"
)
@@ -855,9 +709,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn10133~/Modules/FetchMI/CMakeLists.txt slicer-3.4.0~svn10133/Modules/FetchMI/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/FetchMI/CMakeLists.txt 2009-02-26 14:03:13.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/FetchMI/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/FetchMI/CMakeLists.txt slicer-3.4.0~svn10438/Modules/FetchMI/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/FetchMI/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/FetchMI/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -867,9 +721,21 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt slicer-3.4.0~svn10133/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+@@ -91,6 +89,11 @@
+ Volumes
+ )
+
++set_target_properties(${lib_name} PROPERTIES
++ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++ VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+diff -urNad slicer-3.4.0~svn10438~/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt slicer-3.4.0~svn10438/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -879,9 +745,21 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/Meshing/Adapter/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Meshing/Adapter/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Meshing/Adapter/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/Meshing/Adapter/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+@@ -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})
+
+ # --------------------------------------------------------------------------
+diff -urNad slicer-3.4.0~svn10438~/Modules/Meshing/Adapter/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Meshing/Adapter/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Meshing/Adapter/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/Adapter/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -58,6 +58,11 @@
ITKAlgorithms
)
@@ -894,9 +772,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.4.0~svn10133~/Modules/Meshing/BuildingBlock/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Meshing/BuildingBlock/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Meshing/BuildingBlock/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/Meshing/BuildingBlock/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Meshing/BuildingBlock/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -173,6 +173,11 @@
ITKIO
ITKAlgorithms
@@ -909,9 +787,9 @@
#CONFIGURE_FILE(
-diff -urNad slicer-3.4.0~svn10133~/Modules/Meshing/Common/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Meshing/Common/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Meshing/Common/CMakeLists.txt 2008-12-24 10:07:19.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/Meshing/Common/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/Meshing/Common/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Meshing/Common/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Meshing/Common/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/Common/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -156,6 +156,12 @@
MRML
)
@@ -925,9 +803,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.4.0~svn10133~/Modules/Meshing/Filter/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Meshing/Filter/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Meshing/Filter/CMakeLists.txt 2008-12-24 10:07:19.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/Meshing/Filter/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/Meshing/Filter/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Meshing/Filter/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Meshing/Filter/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/Filter/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -102,6 +102,11 @@
${KWWidgets_LIBRARIES}
)
@@ -940,9 +818,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.4.0~svn10133~/Modules/Meshing/IA_FEMesh/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Meshing/IA_FEMesh/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2008-12-10 09:36:48.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/Meshing/IA_FEMesh/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Meshing/IA_FEMesh/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -44,8 +44,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -952,9 +830,19 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/Meshing/IO/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Meshing/IO/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Meshing/IO/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/Meshing/IO/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+@@ -102,4 +100,9 @@
+ BuildingBlock
+ )
+
++set_target_properties(${LIB_NAME} PROPERTIES
++ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++ VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${LIB_NAME})
+diff -urNad slicer-3.4.0~svn10438~/Modules/Meshing/IO/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Meshing/IO/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Meshing/IO/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/IO/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -60,6 +60,11 @@
vtkRendering
)
@@ -967,9 +855,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.4.0~svn10133~/Modules/Meshing/Widgets/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Meshing/Widgets/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Meshing/Widgets/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/Meshing/Widgets/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/Meshing/Widgets/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Meshing/Widgets/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Meshing/Widgets/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Meshing/Widgets/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -107,6 +107,11 @@
mimxFilter
mimxCommon
@@ -982,9 +870,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.4.0~svn10133~/Modules/NeuroNav/CMakeLists.txt slicer-3.4.0~svn10133/Modules/NeuroNav/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/NeuroNav/CMakeLists.txt 2008-09-12 13:39:46.000000000 -0400
-+++ slicer-3.4.0~svn10133/Modules/NeuroNav/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/NeuroNav/CMakeLists.txt slicer-3.4.0~svn10438/Modules/NeuroNav/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/NeuroNav/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/NeuroNav/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -40,8 +40,6 @@
"${CMAKE_CURRENT_SOURCE_DIR}/*.h"
)
@@ -994,9 +882,21 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/OpenIGTLinkIF/CMakeLists.txt slicer-3.4.0~svn10133/Modules/OpenIGTLinkIF/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/OpenIGTLinkIF/CMakeLists.txt 2008-12-09 16:36:04.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+@@ -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})
+
+
+diff -urNad slicer-3.4.0~svn10438~/Modules/OpenIGTLinkIF/CMakeLists.txt slicer-3.4.0~svn10438/Modules/OpenIGTLinkIF/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -40,8 +40,6 @@
)
@@ -1017,9 +917,9 @@
target_link_libraries(${lib_name}
${Slicer3_Libs_LIBRARIES}
-diff -urNad slicer-3.4.0~svn10133~/Modules/ProstateNav/CMakeLists.txt slicer-3.4.0~svn10133/Modules/ProstateNav/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/ProstateNav/CMakeLists.txt 2009-02-05 22:44:59.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/ProstateNav/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/ProstateNav/CMakeLists.txt slicer-3.4.0~svn10438/Modules/ProstateNav/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/ProstateNav/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/ProstateNav/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -17,12 +17,16 @@
# --------------------------------------------------------------------------
@@ -1070,9 +970,9 @@
${CMAKE_CURRENT_SOURCE_DIR}/newmat/ZLinAlg.cxx
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h slicer-3.4.0~svn10133/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
---- slicer-3.4.0~svn10133~/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2009-02-04 14:15:57.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h slicer-3.4.0~svn10438/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
+--- slicer-3.4.0~svn10438~/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2009-09-13 15:35:42.000000000 -0400
@@ -37,6 +37,13 @@
class VTK_PROSTATENAV_EXPORT vtkProstateNavCalibrationStep : public vtkProstateNavStep
{
@@ -1087,9 +987,9 @@
static vtkProstateNavCalibrationStep *New();
vtkTypeRevisionMacro(vtkProstateNavCalibrationStep,vtkProstateNavStep);
void PrintSelf(ostream& os, vtkIndent indent);
-diff -urNad slicer-3.4.0~svn10133~/Modules/QdecModule/CMakeLists.txt slicer-3.4.0~svn10133/Modules/QdecModule/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/QdecModule/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/QdecModule/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/QdecModule/CMakeLists.txt slicer-3.4.0~svn10438/Modules/QdecModule/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/QdecModule/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/QdecModule/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1111,9 +1011,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn10133~/Modules/QueryAtlas/CMakeLists.txt slicer-3.4.0~svn10133/Modules/QueryAtlas/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/QueryAtlas/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/QueryAtlas/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/QueryAtlas/CMakeLists.txt slicer-3.4.0~svn10438/Modules/QueryAtlas/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/QueryAtlas/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/QueryAtlas/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -42,14 +42,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1129,7 +1029,19 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
-@@ -204,14 +201,14 @@
+@@ -111,6 +108,11 @@
+ QdecModule
+ )
+
++set_target_properties(${lib_name} PROPERTIES
++ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++ VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+@@ -204,14 +206,14 @@
OntologyViz/extjars/prefuse.jar
)
@@ -1155,9 +1067,9 @@
+# DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${path} COMPONENT Development
+# )
+#endforeach(file)
-diff -urNad slicer-3.4.0~svn10133~/Modules/RealTimeImaging/CMakeLists.txt slicer-3.4.0~svn10133/Modules/RealTimeImaging/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/RealTimeImaging/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn10133/Modules/RealTimeImaging/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/RealTimeImaging/CMakeLists.txt slicer-3.4.0~svn10438/Modules/RealTimeImaging/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/RealTimeImaging/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/RealTimeImaging/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -32,7 +32,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1166,9 +1078,9 @@
"${CMAKE_CURRENT_BINARY_DIR}/vtkRealTimeImagingConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/ScriptedModule/CMakeLists.txt slicer-3.4.0~svn10133/Modules/ScriptedModule/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/ScriptedModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/ScriptedModule/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/ScriptedModule/CMakeLists.txt slicer-3.4.0~svn10438/Modules/ScriptedModule/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/ScriptedModule/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/ScriptedModule/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1190,9 +1102,9 @@
# Python settings
if(Slicer3_USE_PYTHON)
-diff -urNad slicer-3.4.0~svn10133~/Modules/SlicerDaemon/CMakeLists.txt slicer-3.4.0~svn10133/Modules/SlicerDaemon/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/SlicerDaemon/CMakeLists.txt 2008-12-08 04:31:27.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/SlicerDaemon/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/SlicerDaemon/CMakeLists.txt slicer-3.4.0~svn10438/Modules/SlicerDaemon/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/SlicerDaemon/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/SlicerDaemon/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1214,9 +1126,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn10133~/Modules/SlicerWelcome/CMakeLists.txt slicer-3.4.0~svn10133/Modules/SlicerWelcome/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/SlicerWelcome/CMakeLists.txt 2009-03-27 15:12:39.000000000 -0400
-+++ slicer-3.4.0~svn10133/Modules/SlicerWelcome/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/SlicerWelcome/CMakeLists.txt slicer-3.4.0~svn10438/Modules/SlicerWelcome/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/SlicerWelcome/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/SlicerWelcome/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -37,8 +37,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1226,9 +1138,20 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/Statistics/LabelStatistics/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Statistics/LabelStatistics/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Statistics/LabelStatistics/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn10133/Modules/Statistics/LabelStatistics/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+@@ -79,5 +77,10 @@
+ ${KWWidgets_LIBRARIES}
+ )
+
++set_target_properties(${lib_name} PROPERTIES
++ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++ VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+
+diff -urNad slicer-3.4.0~svn10438~/Modules/Statistics/LabelStatistics/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Statistics/LabelStatistics/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Statistics/LabelStatistics/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Statistics/LabelStatistics/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1238,9 +1161,21 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/Tractography/Display/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Tractography/Display/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Tractography/Display/CMakeLists.txt 2008-07-10 22:39:00.000000000 -0400
-+++ slicer-3.4.0~svn10133/Modules/Tractography/Display/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+@@ -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})
+
+ # --------------------------------------------------------------------------
+diff -urNad slicer-3.4.0~svn10438~/Modules/Tractography/Display/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Tractography/Display/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Tractography/Display/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Tractography/Display/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -31,14 +31,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1256,9 +1191,19 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/Tractography/FiducialSeeding/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Tractography/FiducialSeeding/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2008-07-30 19:34:00.000000000 -0400
-+++ slicer-3.4.0~svn10133/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+@@ -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})
+diff -urNad slicer-3.4.0~svn10438~/Modules/Tractography/FiducialSeeding/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Tractography/FiducialSeeding/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1280,9 +1225,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn10133~/Modules/Tractography/Seeding/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Tractography/Seeding/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Tractography/Seeding/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn10133/Modules/Tractography/Seeding/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/Tractography/Seeding/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Tractography/Seeding/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Tractography/Seeding/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Tractography/Seeding/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1292,9 +1237,21 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/VolumeRendering/CMakeLists.txt slicer-3.4.0~svn10133/Modules/VolumeRendering/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/VolumeRendering/CMakeLists.txt 2009-01-20 16:30:19.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/VolumeRendering/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+@@ -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})
+
+ # --------------------------------------------------------------------------
+diff -urNad slicer-3.4.0~svn10438~/Modules/VolumeRendering/CMakeLists.txt slicer-3.4.0~svn10438/Modules/VolumeRendering/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/VolumeRendering/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/VolumeRendering/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1304,9 +1261,21 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn10133~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt slicer-3.4.0~svn10133/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-01-07 14:02:39.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+@@ -95,6 +93,11 @@
+ VolumeRenderingReplacements
+ )
+
++set_target_properties(${lib_name} PROPERTIES
++ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++ VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+diff -urNad slicer-3.4.0~svn10438~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt slicer-3.4.0~svn10438/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1326,9 +1295,9 @@
+)
+
slicer3_install_modules(${lib_name})
-diff -urNad slicer-3.4.0~svn10133~/Modules/Volumes/CMakeLists.txt slicer-3.4.0~svn10133/Modules/Volumes/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Modules/Volumes/CMakeLists.txt 2009-01-20 17:30:16.000000000 -0500
-+++ slicer-3.4.0~svn10133/Modules/Volumes/CMakeLists.txt 2009-08-06 15:54:35.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Modules/Volumes/CMakeLists.txt slicer-3.4.0~svn10438/Modules/Volumes/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Modules/Volumes/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Modules/Volumes/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -37,7 +37,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -1349,9 +1318,60 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn10133~/Utilities/Launcher/CMakeLists.txt slicer-3.4.0~svn10133/Utilities/Launcher/CMakeLists.txt
---- slicer-3.4.0~svn10133~/Utilities/Launcher/CMakeLists.txt 2008-09-25 15:26:44.000000000 -0400
-+++ slicer-3.4.0~svn10133/Utilities/Launcher/CMakeLists.txt 2009-08-06 15:56:56.000000000 -0400
+diff -urNad slicer-3.4.0~svn10438~/Scripts/versioner.tcl slicer-3.4.0~svn10438/Scripts/versioner.tcl
+--- slicer-3.4.0~svn10438~/Scripts/versioner.tcl 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Scripts/versioner.tcl 2009-09-13 15:35:42.000000000 -0400
+@@ -16,13 +16,6 @@
+
+ ################################################################################
+
+-# for subversion repositories (Sandbox)
+-if {[info exists ::env(SVN)]} {
+- set ::SVN $::env(SVN)
+-} else {
+- set ::SVN svn
+-}
+-
+
+ ################################################################################
+ # build the lib/Slicer3/Slicer3version.txt file
+@@ -36,28 +29,16 @@
+ 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 svninfo [split [exec svn info] "\n"]
+-array set svn ""
+-foreach line $svninfo {
+- foreach {tag value} $line {
+- if { $tag == "URL:" } {
+- set svn(URL) $value
+- }
+- if { $tag == "Revision:" } {
+- set svn(revision) $value
+- }
+- }
+-}
+ 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
+diff -urNad slicer-3.4.0~svn10438~/Utilities/Launcher/CMakeLists.txt slicer-3.4.0~svn10438/Utilities/Launcher/CMakeLists.txt
+--- slicer-3.4.0~svn10438~/Utilities/Launcher/CMakeLists.txt 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/Utilities/Launcher/CMakeLists.txt 2009-09-13 15:35:42.000000000 -0400
@@ -40,11 +40,11 @@
set(launcher_source
"${CMAKE_CURRENT_SOURCE_DIR}/Slicer3Launchers/${launcher_name}")
@@ -1366,3 +1386,15 @@
endif(EXISTS "${launcher_source}")
# Should this location change, change Application/GUI/Slicer3.cxx as well
+diff -urNad slicer-3.4.0~svn10438~/launch.tcl.in slicer-3.4.0~svn10438/launch.tcl.in
+--- slicer-3.4.0~svn10438~/launch.tcl.in 2009-09-13 15:35:22.000000000 -0400
++++ slicer-3.4.0~svn10438/launch.tcl.in 2009-09-13 15:35:42.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) ""
+
Modified: packages/slicer/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/rules?rev=35842&op=diff
==============================================================================
--- packages/slicer/trunk/debian/rules (original)
+++ packages/slicer/trunk/debian/rules Mon Sep 14 15:44:47 2009
@@ -65,6 +65,11 @@
dh_testdir
# Add here commands to compile the package.
+
+ # generate $(SHARED_BUILD_PATH)/lib/Slicer3/Slicer3Version.txt
+ mkdir -p $(SHARED_BUILD_PATH)/lib/Slicer3
+ ./Scripts/versioner.tcl
+ cat $(SHARED_BUILD_PATH)/lib/Slicer3/Slicer3Version.txt
# build shared libs and binaries
cd $(SHARED_BUILD_PATH) && $(MAKE) $(JOBS)
Modified: packages/slicer/trunk/debian/slicer.install
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/slicer.install?rev=35842&op=diff
==============================================================================
--- packages/slicer/trunk/debian/slicer.install (original)
+++ packages/slicer/trunk/debian/slicer.install Mon Sep 14 15:44:47 2009
@@ -1,3 +1,4 @@
+usr/lib/Slicer3/Slicer3Version.txt
usr/lib/Slicer3/Modules/Editor
usr/lib/Slicer3/Modules/SlicerDaemon
usr/lib/Slicer3/Modules/ScriptedModuleExample
@@ -18,7 +19,6 @@
usr/lib/Slicer3/Plugins/Subtract
usr/lib/Slicer3/Plugins/ResampleVolume
usr/lib/Slicer3/Plugins/RigidRegistration
-usr/lib/Slicer3/Plugins/DWIDicomLoad
usr/lib/Slicer3/Plugins/dwiNoiseFilter
usr/lib/Slicer3/Plugins/CurvatureAnisotropicDiffusion
usr/lib/Slicer3/Plugins/ZeroCrossingBasedEdgeDetectionImageFilter
@@ -51,11 +51,11 @@
usr/bin/DetectGrowthSegmentation
usr/bin/applyDeformationITK
usr/bin/GenerateCLP
-usr/bin/Slicer3-real
+usr/bin/Slicer3-real usr/lib/Slicer3
usr/bin/ChangeTrackerCommandLine
usr/bin/GenerateLMLauncher
usr/bin/DetectGrowth
-usr/bin/Slicer3
+usr/bin/Slicer3 usr/lib/Slicer3
usr/bin/GenerateLM
usr/bin/GenerateCLPLauncher
usr/lib/Slicer3/launch.tcl
@@ -65,3 +65,4 @@
../../Utilities/Launcher/3DSlicerLogoICOimages/3DSlicerLogo-DesktopIcon-48x48x256.png usr/share/pixmaps
../../debian/slicer.desktop usr/share/applications
../../debian/slicer3 usr/bin
+../../debian/Slicer3 usr/bin
Modified: packages/slicer/trunk/debian/slicer3
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/slicer3?rev=35842&op=diff
==============================================================================
--- packages/slicer/trunk/debian/slicer3 (original)
+++ packages/slicer/trunk/debian/slicer3 Mon Sep 14 15:44:47 2009
@@ -1,6 +1,6 @@
#!/bin/sh
-export TK_LIBRARY=/usr/share/tcltk/tk8.4/
+export TK_LIBRARY=/usr/share/tcltk/tk8.5/
/usr/bin/Slicer3 $*
More information about the debian-science-commits
mailing list