r35745 - in /packages/slicer/trunk/debian: Notes changelog control copyright docs get-orig-source libslicer3.lintian-overrides libslicer3.postinst patches/50_all_changes.dpatch postrm.ex preinst.ex prerm.ex rules shlibs.local slicer.install
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Mon Jun 1 01:25:06 UTC 2009
Author: domibel-guest
Date: Mon Jun 1 01:25:06 2009
New Revision: 35745
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35745
Log:
preparation for 3.4
Added:
packages/slicer/trunk/debian/libslicer3.lintian-overrides
Removed:
packages/slicer/trunk/debian/Notes
packages/slicer/trunk/debian/libslicer3.postinst
packages/slicer/trunk/debian/postrm.ex
packages/slicer/trunk/debian/preinst.ex
packages/slicer/trunk/debian/prerm.ex
Modified:
packages/slicer/trunk/debian/changelog
packages/slicer/trunk/debian/control
packages/slicer/trunk/debian/copyright
packages/slicer/trunk/debian/docs
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/shlibs.local
packages/slicer/trunk/debian/slicer.install
Modified: packages/slicer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/changelog?rev=35745&op=diff
==============================================================================
--- packages/slicer/trunk/debian/changelog (original)
+++ packages/slicer/trunk/debian/changelog Mon Jun 1 01:25:06 2009
@@ -1,4 +1,4 @@
-slicer (3.4.0~svn9539-1) unstable; urgency=low
+slicer (3.4.0~svn9629-1) unstable; urgency=low
* Initial release (Closes: #500841)
Modified: packages/slicer/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/control?rev=35745&op=diff
==============================================================================
--- packages/slicer/trunk/debian/control (original)
+++ packages/slicer/trunk/debian/control Mon Jun 1 01:25:06 2009
@@ -68,7 +68,7 @@
Package: slicer-share
Section: doc
Architecture: all
-Depends: slicer
+Depends: slicer, tk8.4 | wish
Description: software package for visualization and image analysis - share
Slicer's capabilities include:
.
Modified: packages/slicer/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/copyright?rev=35745&op=diff
==============================================================================
--- packages/slicer/trunk/debian/copyright (original)
+++ packages/slicer/trunk/debian/copyright Mon Jun 1 01:25:06 2009
@@ -200,6 +200,47 @@
principles of conflicts of law. This Agreement shall supercede and
replace any license terms that you may have agreed to previously with
respect to Slicer.
+
+
+Files: ./Modules/Meshing/*
+Copyright: 2008 MIMX, The University of Iowa
+License: other
+ Permission is hereby granted, free of charge, to any
+ person obtaining a copy of this software and
+ associated documentation files (the "Software"), to
+ deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify,
+ merge, publish, distribute, and/or sell copies of the
+ Software, and to permit persons to whom the Software
+ is furnished to do so, provided that the above
+ copyright notice(s) and this permission notice appear
+ in all copies of the Software and that both the above
+ copyright notice(s) and this permission notice appear
+ in supporting documentation.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY
+ CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+ OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+ .
+ See the web site: http://www.ccad.uiowa.edu/mimx for
+ more information.
+
+
+Files:
+ ./Modules/Meshing/Adapter/itkImageToVTKImageFilter.h
+ ./Modules/Meshing/Adapter/itkImageToVTKImageFilter.txx
+Copyright: ....Insight....
+License: other
+ ....
Files:
@@ -340,7 +381,7 @@
./Libs/vtkITK/itkDisplacementFieldTransform.txx
./Libs/MRMLIDImageIO/itkMRMLIDImageIOFactory.h
./Libs/MRMLIDImageIO/itkMRMLIDImageIOFactory.cxx
-Copyright: 2002, Insight Software Consortium.
+Copyright: Insight Software Consortium.
License: other
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Modified: packages/slicer/trunk/debian/docs
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/docs?rev=35745&op=diff
==============================================================================
--- packages/slicer/trunk/debian/docs (original)
+++ packages/slicer/trunk/debian/docs Mon Jun 1 01:25:06 2009
@@ -1,4 +1,1 @@
-CMakeLists.txt
-License.txt
README.txt
-README.txt
Modified: packages/slicer/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/get-orig-source?rev=35745&op=diff
==============================================================================
--- packages/slicer/trunk/debian/get-orig-source (original)
+++ packages/slicer/trunk/debian/get-orig-source Mon Jun 1 01:25:06 2009
@@ -22,6 +22,35 @@
svn export --quiet --revision ${REVISION} http://svn.slicer.org/Slicer3/branches/Slicer-3-4 ${FOLDER}
+cd ${FOLDER}
+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/msc/
+#- 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
+cd ..
+
GZIP=-9 tar czf ${TARFILE} ${FOLDER}
rm -rf ${FOLDER}
Added: packages/slicer/trunk/debian/libslicer3.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/libslicer3.lintian-overrides?rev=35745&op=file
==============================================================================
--- packages/slicer/trunk/debian/libslicer3.lintian-overrides (added)
+++ packages/slicer/trunk/debian/libslicer3.lintian-overrides Mon Jun 1 01:25:06 2009
@@ -1,0 +1,1 @@
+libslicer3: package-name-doesnt-match-sonames libCommandIO3 libFreeSurfer3 libIGT3 libLoadableModule3 libMGHIO3 libMRML3 libMRMLIDIO3 libModuleDescriptionParser3 libQdec3 libRemoteIO3 libvtkITK3 libvtkTeem3
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=35745&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.dpatch (original)
+++ packages/slicer/trunk/debian/patches/50_all_changes.dpatch Mon Jun 1 01:25:06 2009
@@ -5,9 +5,9 @@
## DP: This patch adds soname version numbers
@DPATCH@
-diff -urNad slicer-3.4.0~svn9539~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt slicer-3.4.0~svn9539/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2008-06-24 18:14:09.000000000 -0400
-+++ slicer-3.4.0~svn9539/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-05-18 19:47:03.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt slicer-3.4.0~svn9629/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2008-06-24 18:14:09.000000000 -0400
++++ slicer-3.4.0~svn9629/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -18,8 +18,8 @@
#
@@ -37,9 +37,9 @@
#
# Move exec and module to where Slicer can find them
-diff -urNad slicer-3.4.0~svn9539~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx slicer-3.4.0~svn9539/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
---- slicer-3.4.0~svn9539~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-04-10 13:33:12.000000000 -0400
-+++ slicer-3.4.0~svn9539/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx slicer-3.4.0~svn9629/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
+--- slicer-3.4.0~svn9629~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-04-10 13:33:12.000000000 -0400
++++ slicer-3.4.0~svn9629/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-05-30 14:23:06.000000000 -0400
@@ -3,7 +3,7 @@
#endif
@@ -49,9 +49,9 @@
#include <itksys/SystemTools.hxx>
#include <itksys/Process.h>
#include <math.h>
-diff -urNad slicer-3.4.0~svn9539~/Applications/GUI/CMakeLists.txt slicer-3.4.0~svn9539/Applications/GUI/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Applications/GUI/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn9539/Applications/GUI/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Applications/GUI/CMakeLists.txt slicer-3.4.0~svn9629/Applications/GUI/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Applications/GUI/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
++++ slicer-3.4.0~svn9629/Applications/GUI/CMakeLists.txt 2009-05-30 14:23:06.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}\"")
@@ -74,9 +74,9 @@
# --------------------------------------------------------------------------
# Include dirs
-diff -urNad slicer-3.4.0~svn9539~/Applications/GUI/Slicer3.cxx slicer-3.4.0~svn9539/Applications/GUI/Slicer3.cxx
---- slicer-3.4.0~svn9539~/Applications/GUI/Slicer3.cxx 2009-05-12 17:24:53.000000000 -0400
-+++ slicer-3.4.0~svn9539/Applications/GUI/Slicer3.cxx 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Applications/GUI/Slicer3.cxx slicer-3.4.0~svn9629/Applications/GUI/Slicer3.cxx
+--- slicer-3.4.0~svn9629~/Applications/GUI/Slicer3.cxx 2009-05-12 17:24:53.000000000 -0400
++++ slicer-3.4.0~svn9629/Applications/GUI/Slicer3.cxx 2009-05-30 14:23:06.000000000 -0400
@@ -411,7 +411,7 @@
}
@@ -86,9 +86,9 @@
vtkKWApplication::PutEnv(const_cast <char *> (tclEnv.c_str()));
// ITK factories dir
-diff -urNad slicer-3.4.0~svn9539~/Base/CLI/CMakeLists.txt slicer-3.4.0~svn9539/Base/CLI/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Base/CLI/CMakeLists.txt 2008-05-20 03:31:33.000000000 -0400
-+++ slicer-3.4.0~svn9539/Base/CLI/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Base/CLI/CMakeLists.txt slicer-3.4.0~svn9629/Base/CLI/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Base/CLI/CMakeLists.txt 2008-05-20 03:31:33.000000000 -0400
++++ slicer-3.4.0~svn9629/Base/CLI/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -58,6 +58,11 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} SlicerBaseCLI)
@@ -101,9 +101,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~svn9539~/Base/GUI/CMakeLists.txt slicer-3.4.0~svn9539/Base/GUI/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Base/GUI/CMakeLists.txt 2009-03-16 11:34:28.000000000 -0400
-+++ slicer-3.4.0~svn9539/Base/GUI/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Base/GUI/CMakeLists.txt slicer-3.4.0~svn9629/Base/GUI/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Base/GUI/CMakeLists.txt 2009-03-16 11:34:28.000000000 -0400
++++ slicer-3.4.0~svn9629/Base/GUI/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -177,6 +177,11 @@
RemoteIO
)
@@ -116,9 +116,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~svn9539~/Base/Logic/CMakeLists.txt slicer-3.4.0~svn9539/Base/Logic/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Base/Logic/CMakeLists.txt 2008-11-05 14:25:28.000000000 -0500
-+++ slicer-3.4.0~svn9539/Base/Logic/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Base/Logic/CMakeLists.txt slicer-3.4.0~svn9629/Base/Logic/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Base/Logic/CMakeLists.txt 2008-11-05 14:25:28.000000000 -0500
++++ slicer-3.4.0~svn9629/Base/Logic/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -115,6 +115,11 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
@@ -131,9 +131,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~svn9539~/CMakeLists.txt slicer-3.4.0~svn9539/CMakeLists.txt
---- slicer-3.4.0~svn9539~/CMakeLists.txt 2009-04-22 19:00:01.000000000 -0400
-+++ slicer-3.4.0~svn9539/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/CMakeLists.txt slicer-3.4.0~svn9629/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/CMakeLists.txt 2009-04-22 19:00:01.000000000 -0400
++++ slicer-3.4.0~svn9629/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -27,6 +27,11 @@
set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
@@ -185,9 +185,18 @@
endif(Slicer3_USE_OPENIGTLINK)
#-----------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn9539~/Libs/FreeSurfer/CMakeLists.txt slicer-3.4.0~svn9539/Libs/FreeSurfer/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/FreeSurfer/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/FreeSurfer/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+@@ -333,7 +346,7 @@
+ #-----------------------------------------------------------------------------
+ # Launcher for slicer
+ #
+-add_subdirectory(Utilities/Launcher)
++#add_subdirectory(Utilities/Launcher)
+
+ configure_file(
+ ${Slicer3_SOURCE_DIR}/launch.tcl.in
+diff -urNad slicer-3.4.0~svn9629~/Libs/FreeSurfer/CMakeLists.txt slicer-3.4.0~svn9629/Libs/FreeSurfer/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/FreeSurfer/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/FreeSurfer/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -68,9 +68,14 @@
vtkIOTCL
)
@@ -204,9 +213,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/IGT/CMakeLists.txt slicer-3.4.0~svn9539/Libs/IGT/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/IGT/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/IGT/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/IGT/CMakeLists.txt slicer-3.4.0~svn9629/Libs/IGT/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/IGT/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/IGT/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -139,9 +139,14 @@
${TRACKING_INTERFACE_LIB}
)
@@ -223,9 +232,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/ITKCommandIO/CMakeLists.txt slicer-3.4.0~svn9539/Libs/ITKCommandIO/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/ITKCommandIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/ITKCommandIO/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/ITKCommandIO/CMakeLists.txt slicer-3.4.0~svn9629/Libs/ITKCommandIO/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/ITKCommandIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/ITKCommandIO/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -71,9 +71,14 @@
ITKIO
)
@@ -242,9 +251,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/LoadableModule/CMakeLists.txt slicer-3.4.0~svn9539/Libs/LoadableModule/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/LoadableModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn9539/Libs/LoadableModule/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/LoadableModule/CMakeLists.txt slicer-3.4.0~svn9629/Libs/LoadableModule/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/LoadableModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
++++ slicer-3.4.0~svn9629/Libs/LoadableModule/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -116,9 +116,14 @@
target_link_libraries(${lib_name} ${link_libs})
@@ -261,9 +270,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/MGHImageIO/CMakeLists.txt slicer-3.4.0~svn9539/Libs/MGHImageIO/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/MGHImageIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/MGHImageIO/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/MGHImageIO/CMakeLists.txt slicer-3.4.0~svn9629/Libs/MGHImageIO/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/MGHImageIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/MGHImageIO/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -59,9 +59,14 @@
ITKIO
)
@@ -280,9 +289,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/MRML/CMakeLists.txt slicer-3.4.0~svn9539/Libs/MRML/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/MRML/CMakeLists.txt 2009-02-27 17:28:47.000000000 -0500
-+++ slicer-3.4.0~svn9539/Libs/MRML/CMakeLists.txt 2009-05-18 19:47:04.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/MRML/CMakeLists.txt slicer-3.4.0~svn9629/Libs/MRML/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/MRML/CMakeLists.txt 2009-02-27 17:28:47.000000000 -0500
++++ slicer-3.4.0~svn9629/Libs/MRML/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -237,9 +237,14 @@
endif(MRML_USE_vtkTeem)
endif(MRML_USE_Teem)
@@ -299,9 +308,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/MRMLIDImageIO/CMakeLists.txt slicer-3.4.0~svn9539/Libs/MRMLIDImageIO/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/MRMLIDImageIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/MRMLIDImageIO/CMakeLists.txt 2009-05-18 19:47:06.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/MRMLIDImageIO/CMakeLists.txt slicer-3.4.0~svn9629/Libs/MRMLIDImageIO/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/MRMLIDImageIO/CMakeLists.txt 2008-05-28 00:38:39.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/MRMLIDImageIO/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -78,9 +78,14 @@
vtkImaging
)
@@ -318,9 +327,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/ModuleDescriptionParser/CMakeLists.txt slicer-3.4.0~svn9539/Libs/ModuleDescriptionParser/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn9539/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/ModuleDescriptionParser/CMakeLists.txt slicer-3.4.0~svn9629/Libs/ModuleDescriptionParser/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
++++ slicer-3.4.0~svn9629/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -120,9 +120,14 @@
target_link_libraries(${lib_name} ${link_libs})
@@ -337,9 +346,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/Qdec/CMakeLists.txt slicer-3.4.0~svn9539/Libs/Qdec/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/Qdec/CMakeLists.txt 2008-05-31 13:31:15.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/Qdec/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/Qdec/CMakeLists.txt slicer-3.4.0~svn9629/Libs/Qdec/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/Qdec/CMakeLists.txt 2008-05-31 13:31:15.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/Qdec/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -76,9 +76,14 @@
# vtkIOTCL
)
@@ -356,9 +365,20 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/RemoteIO/CMakeLists.txt slicer-3.4.0~svn9539/Libs/RemoteIO/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/RemoteIO/CMakeLists.txt 2008-10-10 10:41:24.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/RemoteIO/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/Qdec/QdecContrast.cpp slicer-3.4.0~svn9629/Libs/Qdec/QdecContrast.cpp
+--- slicer-3.4.0~svn9629~/Libs/Qdec/QdecContrast.cpp 2009-05-19 18:25:04.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/Qdec/QdecContrast.cpp 2009-05-30 14:23:48.000000000 -0400
+@@ -16,6 +16,7 @@
+ #include <errno.h>
+ #include <sys/stat.h>
+ #include <cassert>
++#include <cstdio>
+
+ #include "QdecContrast.h"
+
+diff -urNad slicer-3.4.0~svn9629~/Libs/RemoteIO/CMakeLists.txt slicer-3.4.0~svn9629/Libs/RemoteIO/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/RemoteIO/CMakeLists.txt 2008-10-10 10:41:24.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/RemoteIO/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -11,8 +11,11 @@
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
@@ -394,9 +414,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.4.0~svn9539/Libs/RemoteIO/vtkHTTPHandler.h
---- slicer-3.4.0~svn9539~/Libs/RemoteIO/vtkHTTPHandler.h 2008-10-10 10:41:24.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/RemoteIO/vtkHTTPHandler.h 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.4.0~svn9629/Libs/RemoteIO/vtkHTTPHandler.h
+--- slicer-3.4.0~svn9629~/Libs/RemoteIO/vtkHTTPHandler.h 2008-10-10 10:41:24.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/RemoteIO/vtkHTTPHandler.h 2009-05-30 14:23:06.000000000 -0400
@@ -5,7 +5,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -406,9 +426,9 @@
#include <vtkRemoteIOConfigure.h>
#include "vtkRemoteIO.h"
-diff -urNad slicer-3.4.0~svn9539~/Libs/SlicerIO/CMakeLists.txt slicer-3.4.0~svn9539/Libs/SlicerIO/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/SlicerIO/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/SlicerIO/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/SlicerIO/CMakeLists.txt slicer-3.4.0~svn9629/Libs/SlicerIO/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/SlicerIO/CMakeLists.txt 2008-05-21 19:25:36.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/SlicerIO/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -48,7 +48,7 @@
install(TARGETS ${lib_name}
@@ -418,9 +438,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/tclap/CMakeLists.txt slicer-3.4.0~svn9539/Libs/tclap/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/tclap/CMakeLists.txt 2008-06-25 09:17:35.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/tclap/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/tclap/CMakeLists.txt slicer-3.4.0~svn9629/Libs/tclap/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/tclap/CMakeLists.txt 2008-06-25 09:17:35.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/tclap/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -13,10 +13,9 @@
@@ -433,9 +453,9 @@
DESTINATION include/tclap COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/vtkITK/CMakeLists.txt slicer-3.4.0~svn9539/Libs/vtkITK/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/vtkITK/CMakeLists.txt 2009-03-25 19:01:37.000000000 -0400
-+++ slicer-3.4.0~svn9539/Libs/vtkITK/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/vtkITK/CMakeLists.txt slicer-3.4.0~svn9629/Libs/vtkITK/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/vtkITK/CMakeLists.txt 2009-03-25 19:01:37.000000000 -0400
++++ slicer-3.4.0~svn9629/Libs/vtkITK/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -111,9 +111,14 @@
ITKDICOMParser
)
@@ -452,9 +472,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Libs/vtkTeem/CMakeLists.txt slicer-3.4.0~svn9539/Libs/vtkTeem/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Libs/vtkTeem/CMakeLists.txt 2008-11-05 18:39:51.000000000 -0500
-+++ slicer-3.4.0~svn9539/Libs/vtkTeem/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Libs/vtkTeem/CMakeLists.txt slicer-3.4.0~svn9629/Libs/vtkTeem/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Libs/vtkTeem/CMakeLists.txt 2008-11-05 18:39:51.000000000 -0500
++++ slicer-3.4.0~svn9629/Libs/vtkTeem/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -111,9 +111,14 @@
${Teem_LIBRARIES}
)
@@ -471,9 +491,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/ChangeTracker/CMakeLists.txt slicer-3.4.0~svn9539/Modules/ChangeTracker/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/ChangeTracker/CMakeLists.txt 2009-04-30 13:59:22.000000000 -0400
-+++ slicer-3.4.0~svn9539/Modules/ChangeTracker/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/ChangeTracker/CMakeLists.txt slicer-3.4.0~svn9629/Modules/ChangeTracker/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/ChangeTracker/CMakeLists.txt 2009-04-30 13:59:22.000000000 -0400
++++ slicer-3.4.0~svn9629/Modules/ChangeTracker/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -40,8 +40,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -495,9 +515,9 @@
target_link_libraries(${lib_name}
${Slicer3_Libs_LIBRARIES}
${Slicer3_Base_LIBRARIES}
-diff -urNad slicer-3.4.0~svn9539~/Modules/CommandLineModule/CMakeLists.txt slicer-3.4.0~svn9539/Modules/CommandLineModule/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/CommandLineModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/CommandLineModule/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/CommandLineModule/CMakeLists.txt slicer-3.4.0~svn9629/Modules/CommandLineModule/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/CommandLineModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/CommandLineModule/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -519,9 +539,9 @@
# Python settings
if(Slicer3_USE_PYTHON)
-diff -urNad slicer-3.4.0~svn9539~/Modules/EMSegment/CMakeLists.txt slicer-3.4.0~svn9539/Modules/EMSegment/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/EMSegment/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn9539/Modules/EMSegment/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/EMSegment/CMakeLists.txt slicer-3.4.0~svn9629/Modules/EMSegment/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/EMSegment/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
++++ slicer-3.4.0~svn9629/Modules/EMSegment/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -44,8 +44,6 @@
"${CMAKE_CURRENT_SOURCE_DIR}/Registration/*.h"
)
@@ -543,9 +563,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn9539~/Modules/FetchMI/CMakeLists.txt slicer-3.4.0~svn9539/Modules/FetchMI/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/FetchMI/CMakeLists.txt 2009-02-26 14:03:13.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/FetchMI/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/FetchMI/CMakeLists.txt slicer-3.4.0~svn9629/Modules/FetchMI/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/FetchMI/CMakeLists.txt 2009-02-26 14:03:13.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/FetchMI/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -555,9 +575,9 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt slicer-3.4.0~svn9539/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt slicer-3.4.0~svn9629/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -567,9 +587,9 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/Meshing/Adapter/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Meshing/Adapter/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Meshing/Adapter/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/Meshing/Adapter/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Meshing/Adapter/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Meshing/Adapter/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Meshing/Adapter/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/Meshing/Adapter/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -58,6 +58,11 @@
ITKAlgorithms
)
@@ -582,9 +602,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~svn9539~/Modules/Meshing/BuildingBlock/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Meshing/BuildingBlock/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Meshing/BuildingBlock/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Meshing/BuildingBlock/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Meshing/BuildingBlock/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Meshing/BuildingBlock/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -173,6 +173,11 @@
ITKIO
ITKAlgorithms
@@ -597,9 +617,9 @@
#CONFIGURE_FILE(
-diff -urNad slicer-3.4.0~svn9539~/Modules/Meshing/Common/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Meshing/Common/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Meshing/Common/CMakeLists.txt 2008-12-24 10:07:19.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/Meshing/Common/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Meshing/Common/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Meshing/Common/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Meshing/Common/CMakeLists.txt 2008-12-24 10:07:19.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/Meshing/Common/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -156,6 +156,12 @@
MRML
)
@@ -613,9 +633,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~svn9539~/Modules/Meshing/Filter/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Meshing/Filter/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Meshing/Filter/CMakeLists.txt 2008-12-24 10:07:19.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/Meshing/Filter/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Meshing/Filter/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Meshing/Filter/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Meshing/Filter/CMakeLists.txt 2008-12-24 10:07:19.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/Meshing/Filter/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -102,6 +102,11 @@
${KWWidgets_LIBRARIES}
)
@@ -628,9 +648,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~svn9539~/Modules/Meshing/IA_FEMesh/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Meshing/IA_FEMesh/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2008-12-10 09:36:48.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Meshing/IA_FEMesh/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Meshing/IA_FEMesh/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2008-12-10 09:36:48.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -44,8 +44,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -640,9 +660,9 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/Meshing/IO/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Meshing/IO/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Meshing/IO/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/Meshing/IO/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Meshing/IO/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Meshing/IO/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Meshing/IO/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/Meshing/IO/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -60,6 +60,11 @@
vtkRendering
)
@@ -655,9 +675,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~svn9539~/Modules/Meshing/Widgets/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Meshing/Widgets/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Meshing/Widgets/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/Meshing/Widgets/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Meshing/Widgets/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Meshing/Widgets/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Meshing/Widgets/CMakeLists.txt 2008-12-11 12:55:09.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/Meshing/Widgets/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -107,6 +107,11 @@
mimxFilter
mimxCommon
@@ -670,9 +690,9 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.4.0~svn9539~/Modules/NeuroNav/CMakeLists.txt slicer-3.4.0~svn9539/Modules/NeuroNav/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/NeuroNav/CMakeLists.txt 2008-09-12 13:39:46.000000000 -0400
-+++ slicer-3.4.0~svn9539/Modules/NeuroNav/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/NeuroNav/CMakeLists.txt slicer-3.4.0~svn9629/Modules/NeuroNav/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/NeuroNav/CMakeLists.txt 2008-09-12 13:39:46.000000000 -0400
++++ slicer-3.4.0~svn9629/Modules/NeuroNav/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -40,8 +40,6 @@
"${CMAKE_CURRENT_SOURCE_DIR}/*.h"
)
@@ -682,9 +702,9 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/OpenIGTLinkIF/CMakeLists.txt slicer-3.4.0~svn9539/Modules/OpenIGTLinkIF/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/OpenIGTLinkIF/CMakeLists.txt 2008-12-09 16:36:04.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/OpenIGTLinkIF/CMakeLists.txt slicer-3.4.0~svn9629/Modules/OpenIGTLinkIF/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/OpenIGTLinkIF/CMakeLists.txt 2008-12-09 16:36:04.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -40,8 +40,6 @@
)
@@ -705,9 +725,9 @@
target_link_libraries(${lib_name}
${Slicer3_Libs_LIBRARIES}
-diff -urNad slicer-3.4.0~svn9539~/Modules/ProstateNav/CMakeLists.txt slicer-3.4.0~svn9539/Modules/ProstateNav/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/ProstateNav/CMakeLists.txt 2009-02-05 22:44:59.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/ProstateNav/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/ProstateNav/CMakeLists.txt slicer-3.4.0~svn9629/Modules/ProstateNav/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/ProstateNav/CMakeLists.txt 2009-02-05 22:44:59.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/ProstateNav/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -17,6 +17,8 @@
# --------------------------------------------------------------------------
@@ -717,9 +737,9 @@
#
-diff -urNad slicer-3.4.0~svn9539~/Modules/QdecModule/CMakeLists.txt slicer-3.4.0~svn9539/Modules/QdecModule/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/QdecModule/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/QdecModule/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/QdecModule/CMakeLists.txt slicer-3.4.0~svn9629/Modules/QdecModule/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/QdecModule/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/QdecModule/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -741,9 +761,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn9539~/Modules/QueryAtlas/CMakeLists.txt slicer-3.4.0~svn9539/Modules/QueryAtlas/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/QueryAtlas/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/QueryAtlas/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/QueryAtlas/CMakeLists.txt slicer-3.4.0~svn9629/Modules/QueryAtlas/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/QueryAtlas/CMakeLists.txt 2008-11-21 00:20:51.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/QueryAtlas/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -42,14 +42,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -759,9 +779,35 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/RealTimeImaging/CMakeLists.txt slicer-3.4.0~svn9539/Modules/RealTimeImaging/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/RealTimeImaging/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn9539/Modules/RealTimeImaging/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+@@ -204,14 +201,14 @@
+ OntologyViz/extjars/prefuse.jar
+ )
+
+-foreach(file ${ONTOVIZFILES})
+- configure_file(
+- ${CMAKE_CURRENT_SOURCE_DIR}/${file}
+- ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${file}
+- COPYONLY)
+- get_filename_component(path "${file}" PATH)
+- install(FILES
+- ${file}
+- DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${path} COMPONENT Development
+- )
+-endforeach(file)
++#foreach(file ${ONTOVIZFILES})
++# configure_file(
++# ${CMAKE_CURRENT_SOURCE_DIR}/${file}
++# ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${file}
++# COPYONLY)
++# get_filename_component(path "${file}" PATH)
++# install(FILES
++# ${file}
++# DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${path} COMPONENT Development
++# )
++#endforeach(file)
+diff -urNad slicer-3.4.0~svn9629~/Modules/RealTimeImaging/CMakeLists.txt slicer-3.4.0~svn9629/Modules/RealTimeImaging/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/RealTimeImaging/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
++++ slicer-3.4.0~svn9629/Modules/RealTimeImaging/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -32,7 +32,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -770,9 +816,9 @@
"${CMAKE_CURRENT_BINARY_DIR}/vtkRealTimeImagingConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/ScriptedModule/CMakeLists.txt slicer-3.4.0~svn9539/Modules/ScriptedModule/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/ScriptedModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/ScriptedModule/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/ScriptedModule/CMakeLists.txt slicer-3.4.0~svn9629/Modules/ScriptedModule/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/ScriptedModule/CMakeLists.txt 2009-02-11 17:48:16.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/ScriptedModule/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -794,9 +840,9 @@
# Python settings
if(Slicer3_USE_PYTHON)
-diff -urNad slicer-3.4.0~svn9539~/Modules/SlicerDaemon/CMakeLists.txt slicer-3.4.0~svn9539/Modules/SlicerDaemon/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/SlicerDaemon/CMakeLists.txt 2008-12-08 04:31:27.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/SlicerDaemon/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/SlicerDaemon/CMakeLists.txt slicer-3.4.0~svn9629/Modules/SlicerDaemon/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/SlicerDaemon/CMakeLists.txt 2008-12-08 04:31:27.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/SlicerDaemon/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -818,9 +864,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn9539~/Modules/SlicerWelcome/CMakeLists.txt slicer-3.4.0~svn9539/Modules/SlicerWelcome/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/SlicerWelcome/CMakeLists.txt 2009-03-27 15:12:39.000000000 -0400
-+++ slicer-3.4.0~svn9539/Modules/SlicerWelcome/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/SlicerWelcome/CMakeLists.txt slicer-3.4.0~svn9629/Modules/SlicerWelcome/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/SlicerWelcome/CMakeLists.txt 2009-03-27 15:12:39.000000000 -0400
++++ slicer-3.4.0~svn9629/Modules/SlicerWelcome/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -37,8 +37,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -830,9 +876,9 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/Statistics/LabelStatistics/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Statistics/LabelStatistics/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Statistics/LabelStatistics/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn9539/Modules/Statistics/LabelStatistics/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Statistics/LabelStatistics/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Statistics/LabelStatistics/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Statistics/LabelStatistics/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
++++ slicer-3.4.0~svn9629/Modules/Statistics/LabelStatistics/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -842,9 +888,9 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/Tractography/Display/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Tractography/Display/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Tractography/Display/CMakeLists.txt 2008-07-10 22:39:00.000000000 -0400
-+++ slicer-3.4.0~svn9539/Modules/Tractography/Display/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Tractography/Display/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Tractography/Display/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Tractography/Display/CMakeLists.txt 2008-07-10 22:39:00.000000000 -0400
++++ slicer-3.4.0~svn9629/Modules/Tractography/Display/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -31,14 +31,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -860,9 +906,9 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/Tractography/FiducialSeeding/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Tractography/FiducialSeeding/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2008-07-30 19:34:00.000000000 -0400
-+++ slicer-3.4.0~svn9539/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Tractography/FiducialSeeding/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Tractography/FiducialSeeding/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2008-07-30 19:34:00.000000000 -0400
++++ slicer-3.4.0~svn9629/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -884,9 +930,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.4.0~svn9539~/Modules/Tractography/Seeding/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Tractography/Seeding/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Tractography/Seeding/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
-+++ slicer-3.4.0~svn9539/Modules/Tractography/Seeding/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Tractography/Seeding/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Tractography/Seeding/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Tractography/Seeding/CMakeLists.txt 2008-05-27 18:44:06.000000000 -0400
++++ slicer-3.4.0~svn9629/Modules/Tractography/Seeding/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -896,9 +942,9 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/VolumeRendering/CMakeLists.txt slicer-3.4.0~svn9539/Modules/VolumeRendering/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/VolumeRendering/CMakeLists.txt 2009-01-20 16:30:19.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/VolumeRendering/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/VolumeRendering/CMakeLists.txt slicer-3.4.0~svn9629/Modules/VolumeRendering/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/VolumeRendering/CMakeLists.txt 2009-01-20 16:30:19.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/VolumeRendering/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -908,9 +954,9 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.4.0~svn9539~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt slicer-3.4.0~svn9539/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-01-07 14:02:39.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt slicer-3.4.0~svn9629/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-01-07 14:02:39.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -31,8 +31,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -930,9 +976,9 @@
+)
+
slicer3_install_modules(${lib_name})
-diff -urNad slicer-3.4.0~svn9539~/Modules/Volumes/CMakeLists.txt slicer-3.4.0~svn9539/Modules/Volumes/CMakeLists.txt
---- slicer-3.4.0~svn9539~/Modules/Volumes/CMakeLists.txt 2009-01-20 17:30:16.000000000 -0500
-+++ slicer-3.4.0~svn9539/Modules/Volumes/CMakeLists.txt 2009-05-18 19:47:07.000000000 -0400
+diff -urNad slicer-3.4.0~svn9629~/Modules/Volumes/CMakeLists.txt slicer-3.4.0~svn9629/Modules/Volumes/CMakeLists.txt
+--- slicer-3.4.0~svn9629~/Modules/Volumes/CMakeLists.txt 2009-01-20 17:30:16.000000000 -0500
++++ slicer-3.4.0~svn9629/Modules/Volumes/CMakeLists.txt 2009-05-30 14:23:06.000000000 -0400
@@ -37,8 +37,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
Modified: packages/slicer/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/rules?rev=35745&op=diff
==============================================================================
--- packages/slicer/trunk/debian/rules (original)
+++ packages/slicer/trunk/debian/rules Mon Jun 1 01:25:06 2009
@@ -28,15 +28,15 @@
SHARED_BUILD_PATH = DEB_build_shared
CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_CXX_FLAGS="-Wno-deprecated" \
+ -DCMAKE_CXX_FLAGS:STRING=-Wno-deprecated \
-DCMAKE_CXX_FLAGS=$(CFLAGS) \
- -DCMAKE_BUILD_TYPE="Debug" \
+ -DCMAKE_BUILD_TYPE:STRING=Debug \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
-DVOLUMERENDERINGMODULE:BOOL=ON \
-DCMAKE_SKIP_RPATH:BOOL=OFF \
-DBUILD_TESTING:BOOL=OFF \
- -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
- -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
+ -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 \
@@ -61,8 +61,7 @@
build: build-stamp
-
-build-stamp: configure-stamp
+build-stamp: configure
dh_testdir
# Add here commands to compile the package.
@@ -80,14 +79,15 @@
clean-patched:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp configure-stamp install-stamp
# Add here commands to clean up after the build process.
rm -rf $(SHARED_BUILD_PATH)
dh_clean --exclude ./Libs/FreeSurfer/Testing/TestData/lh.dart.orig
-install: build
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_prep --exclude ./Libs/FreeSurfer/Testing/TestData/lh.dart.orig
@@ -98,46 +98,67 @@
# install binaries and shared libs
cd $(SHARED_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_install -pslicer Utilities/Launcher/3DSlicerLogoICOimages/3DSlicerLogo-DesktopIcon-48x48x256.png usr/share/pixmaps
- dh_install -pslicer debian/slicer.desktop usr/share/applications
- dh_install -pslicer debian/slicer3 usr/bin
+ # 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/QueryAtlas/Tcl/QueryAtlasFips2Mrml.tcl
+ chmod -x $(CURDIR)/Utilities/Launcher/3DSlicerLogoICOimages/3DSlicerLogo-DesktopIcon-48x48x256.png
dh_install --sourcedir=$(CURDIR)/debian/tmp --fail-missing
+ touch $@
+
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
+ dh_testdir -i
+ dh_testroot -i
+ dh_installchangelogs -i
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_lintian -i
+ dh_installman -i
+ dh_link -i
+ dh_strip -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_makeshlibs -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps -l $(CURDIR)/debian/tmp/usr/lib:$(CURDIR)/debian/tmp/usr/lib/Slicer3:$(CURDIR)/debian/tmp/usr/lib/Slicer3/Modules
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+binary-arch: install
+ dh_testdir -a
+ dh_testroot -a
+ dh_installchangelogs -a
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_lintian -a
+ dh_installman -a
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ 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_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
Modified: packages/slicer/trunk/debian/shlibs.local
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/shlibs.local?rev=35745&op=diff
==============================================================================
--- packages/slicer/trunk/debian/shlibs.local (original)
+++ packages/slicer/trunk/debian/shlibs.local Mon Jun 1 01:25:06 2009
@@ -1,30 +1,30 @@
-libLoadableModule 3 libslicer3 (>= 3.0.0-1)
-libModuleDescriptionParser 3 libslicer3 (>= 3.0.0-1)
-libSlicerBaseLogic 3 libslicer3 (>= 3.0.0-1)
-libMRML 3 libslicer3 (>= 3.0.0-1)
-libFreeSurfer 3 libslicer3 (>= 3.0.0-1)
-libIGT 3 libslicer3 (>= 3.0.0-1)
-libRemoteIO 3 libslicer3 (>= 3.0.0-1)
-libCommandLineModule 3 libslicer3 (>= 3.0.0-1)
-libvtkITK 3 libslicer3 (>= 3.0.0-1)
-libvtkTeem 3 libslicer3 (>= 3.0.0-1)
-libSlicerBaseCLI 3 libslicer3 (>= 3.0.0-1)
-libScriptedModule 3 libslicer3 (>= 3.0.0-1)
-libSlicerDaemon 3 libslicer3 (>= 3.0.0-1)
-libSlicerBaseGUI 3 libslicer3 (>= 3.0.0-1)
-libEMSegment 3 libslicer3 (>= 3.0.0-1)
-libQueryAtlas 3 libslicer3 (>= 3.0.0-1)
-libQdecModule 3 libslicer3 (>= 3.0.0-1)
-libVolumes 3 libslicer3 (>= 3.0.0-1)
-libVolumeRenderingReplacements 3 libslicer3 (>= 3.0.0-1)
+libLoadableModule 3 libslicer3 (>= 3.0.0-1)
+libModuleDescriptionParser 3 libslicer3 (>= 3.0.0-1)
+libSlicerBaseLogic 3 libslicer3 (>= 3.0.0-1)
+libMRML 3 libslicer3 (>= 3.0.0-1)
+libFreeSurfer 3 libslicer3 (>= 3.0.0-1)
+libIGT 3 libslicer3 (>= 3.0.0-1)
+libRemoteIO 3 libslicer3 (>= 3.0.0-1)
+libCommandLineModule 3 libslicer3 (>= 3.0.0-1)
+libvtkITK 3 libslicer3 (>= 3.0.0-1)
+libvtkTeem 3 libslicer3 (>= 3.0.0-1)
+libSlicerBaseCLI 3 libslicer3 (>= 3.0.0-1)
+libScriptedModule 3 libslicer3 (>= 3.0.0-1)
+libSlicerDaemon 3 libslicer3 (>= 3.0.0-1)
+libSlicerBaseGUI 3 libslicer3 (>= 3.0.0-1)
+libEMSegment 3 libslicer3 (>= 3.0.0-1)
+libQueryAtlas 3 libslicer3 (>= 3.0.0-1)
+libQdecModule 3 libslicer3 (>= 3.0.0-1)
+libVolumes 3 libslicer3 (>= 3.0.0-1)
+libVolumeRenderingReplacements 3 libslicer3 (>= 3.0.0-1)
libSlicerTractographyFiducialSeeding 3 libslicer3 (>= 3.0.0-1)
-libmimxMeshIO 3 libslicer3 (>= 3.0.0-1)
-libmimxFilter 3 libslicer3 (>= 3.0.0-1)
-libmimxCommon 3 libslicer3 (>= 3.0.0-1)
-libmimxWidgets 3 libslicer3 (>= 3.0.0-1)
-libBuildingBlock 3 libslicer3 (>= 3.0.0-1)
-libQdec 3 libslicer3 (>= 3.0.0-1)
-libMRMLIDIO 3 libslicer3 (>= 3.0.0-1)
-libMGHIO 3 libslicer3 (>= 3.0.0-1)
-libOpenIGTLinkIF 3 libslicer3 (>= 3.0.0-1)
-libChangeTracker 3 libslicer3 (>= 3.0.0-1)
+libmimxMeshIO 3 libslicer3 (>= 3.0.0-1)
+libmimxFilter 3 libslicer3 (>= 3.0.0-1)
+libmimxCommon 3 libslicer3 (>= 3.0.0-1)
+libmimxWidgets 3 libslicer3 (>= 3.0.0-1)
+libBuildingBlock 3 libslicer3 (>= 3.0.0-1)
+libQdec 3 libslicer3 (>= 3.0.0-1)
+libMRMLIDIO 3 libslicer3 (>= 3.0.0-1)
+libMGHIO 3 libslicer3 (>= 3.0.0-1)
+libOpenIGTLinkIF 3 libslicer3 (>= 3.0.0-1)
+libChangeTracker 3 libslicer3 (>= 3.0.0-1)
Modified: packages/slicer/trunk/debian/slicer.install
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/slicer.install?rev=35745&op=diff
==============================================================================
--- packages/slicer/trunk/debian/slicer.install (original)
+++ packages/slicer/trunk/debian/slicer.install Mon Jun 1 01:25:06 2009
@@ -1,7 +1,6 @@
usr/lib/Slicer3/Modules/Editor
usr/lib/Slicer3/Modules/SlicerDaemon
usr/lib/Slicer3/Modules/ScriptedModuleExample
-usr/lib/Slicer3/Modules/QueryAtlas
usr/lib/Slicer3/Modules/ClipModel
usr/lib/Slicer3/Modules/ModelIntoLabelVolume
usr/lib/Slicer3/SlicerBaseGUI
@@ -63,6 +62,7 @@
usr/lib/Slicer3/launch.tcl
usr/lib/Qdec/vtkFreeSurferReaders.tcl
usr/lib/Slicer3/Modules/FetchMI/Tcl/FetchMIXMLUtilities.tcl
-usr/Slicer3
usr/lib/Slicer3/Modules/lib*.so.*
-
+../../Utilities/Launcher/3DSlicerLogoICOimages/3DSlicerLogo-DesktopIcon-48x48x256.png usr/share/pixmaps
+../../debian/slicer.desktop usr/share/applications
+../../debian/slicer3 usr/bin
More information about the debian-science-commits
mailing list