r35605 - in /packages/slicer/trunk/debian: changelog control get-orig-source patches/50_all_changes.dpatch rules shlibs.local watch
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Thu Mar 26 01:15:42 UTC 2009
Author: domibel-guest
Date: Thu Mar 26 01:15:41 2009
New Revision: 35605
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35605
Log:
preparation for 3.3
Added:
packages/slicer/trunk/debian/watch
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/shlibs.local
Modified: packages/slicer/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/changelog?rev=35605&op=diff
==============================================================================
--- packages/slicer/trunk/debian/changelog (original)
+++ packages/slicer/trunk/debian/changelog Thu Mar 26 01:15:41 2009
@@ -1,5 +1,5 @@
-slicer (3.3.0~svn8902-1) unstable; urgency=low
+slicer (3.3.0~svn8934-1) unstable; urgency=low
* Initial release (Closes: #500841)
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 22 Mar 2008 10:08:42 +0000
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sun, 22 Mar 2009 21:28:05 -0400
Modified: packages/slicer/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/control?rev=35605&op=diff
==============================================================================
--- packages/slicer/trunk/debian/control (original)
+++ packages/slicer/trunk/debian/control Thu Mar 26 01:15:41 2009
@@ -48,7 +48,7 @@
Package: libslicer3-dev
-Section: libs
+Section: libdevel
Architecture: any
Depends: libslicer3 (= ${binary:Version}), ${shlibs:Depends}
Description: software package for visualization and image analysis - development
@@ -62,3 +62,22 @@
* visualization of tracking information for image-guided procedures.
.
Slicer3D development files.
+
+
+Package: slicer-share
+Section: docs
+Architecture: all
+Depends: libslicer3 (= ${binary:Version}), ${shlibs:Depends}
+Description: software package for visualization and image analysis - share
+ Slicer's capabilities include:
+ .
+ * interactive visualization of images,
+ * manual editing,
+ * fusion and co-registering of data,
+ * automatic segmentation,
+ * analysis of diffuse tensor imaging data, and
+ * visualization of tracking information for image-guided procedures.
+ .
+ Slicer3D share files.
+
+
Modified: packages/slicer/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/get-orig-source?rev=35605&op=diff
==============================================================================
--- packages/slicer/trunk/debian/get-orig-source (original)
+++ packages/slicer/trunk/debian/get-orig-source Thu Mar 26 01:15:41 2009
@@ -1,6 +1,6 @@
VERSION=3.3.0
PACKAGE=slicer
-REVISION=8902
+REVISION=8934
svn checkout -r $REVISION http://svn.slicer.org/Slicer3/trunk trunk
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=35605&op=diff
==============================================================================
--- packages/slicer/trunk/debian/patches/50_all_changes.dpatch (original)
+++ packages/slicer/trunk/debian/patches/50_all_changes.dpatch Thu Mar 26 01:15:41 2009
@@ -5,21 +5,74 @@
## DP: This patch adds soname version numbers
@DPATCH@
-diff -urNad slicer-3.3.0~svn8902~/Applications/CLI/CMakeLists.txt slicer-3.3.0~svn8902/Applications/CLI/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Applications/CLI/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Applications/CLI/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Applications/CLI/CMakeLists.txt slicer-3.3.0~svn8934/Applications/CLI/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Applications/CLI/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Applications/CLI/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -570,7 +570,7 @@
# subdirs( EndoNavTracking )
subdirs( ExtractSkeleton )
if( ${ITK_VERSION_MAJOR} GREATER 3 OR ${ITK_VERSION_MINOR} GREATER 6 )
- subdirs( RegisterImagesModule )
-+# subdirs( RegisterImagesModule )
++# subdirs( RegisterImagesModule )
endif( ${ITK_VERSION_MAJOR} GREATER 3 OR ${ITK_VERSION_MINOR} GREATER 6 )
#subdirs( UtahBSpline )
subdirs( DiffeomorphicDemonsRegistration )
-diff -urNad slicer-3.3.0~svn8902~/Applications/GUI/CMakeLists.txt slicer-3.3.0~svn8902/Applications/GUI/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Applications/GUI/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Applications/GUI/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt slicer-3.3.0~svn8934/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+@@ -18,8 +18,8 @@
+
+ #
+ # Find SLICERLIBCURL (slicercurl)
+-find_package(SLICERLIBCURL REQUIRED)
+-include(${SLICERLIBCURL_USE_FILE})
++find_package(CURL REQUIRED)
++include(${CURL_INCLUDE_DIRS})
+
+ #
+ # Find GenerateCLP
+@@ -39,7 +39,7 @@
+ add_executable(DownloadSlicerTutorials ${DownloadSlicerTutorials_SOURCE})
+ slicer3_set_plugins_output_path(DownloadSlicerTutorials)
+ target_link_libraries(DownloadSlicerTutorials
+- ${SLICERLIBCURL_LIBRARIES} ITKIO MRMLIDIO itkzlib)
++ ${CURL_LIBRARIES} ITKIO MRMLIDIO)
+
+ #
+ # Generate shared loadable slicer module
+@@ -49,7 +49,7 @@
+ COMPILE_FLAGS "-Dmain=ModuleEntryPoint")
+ slicer3_set_plugins_output_path(DownloadSlicerTutorialsModule)
+ target_link_libraries(DownloadSlicerTutorialsModule
+- ${SLICERLIBCURL_LIBRARIES} ITKIO MRMLIDIO itkzlib)
++ ${CURL_LIBRARIES} ITKIO MRMLIDIO)
+
+ #
+ # Move exec and module to where Slicer can find them
+diff -urNad slicer-3.3.0~svn8934~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx slicer-3.3.0~svn8934/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
+--- slicer-3.3.0~svn8934~/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2009-03-25 20:35:36.000000000 -0400
+@@ -3,7 +3,7 @@
+ #endif
+
+ // Includes
+-#include <slicerlibcurl/slicerlibcurl.h>
++#include <curl/curl.h>
+ #include <itksys/SystemTools.hxx>
+ #include <itksys/Process.h>
+ #include <math.h>
+diff -urNad slicer-3.3.0~svn8934~/Applications/GUI/CMakeLists.txt slicer-3.3.0~svn8934/Applications/GUI/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Applications/GUI/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Applications/GUI/CMakeLists.txt 2009-03-25 20:36:54.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}\"")
+ set(Slicer3_FORWARD_PATH_INSTALL
+- "\"../${Slicer3_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\",\"../lib/KWWidgets\",\"../lib/InsightToolkit\",\"../lib/Teem-${Teem_VERSION_MAJOR}.${Teem_VERSION_MINOR}\",\"../lib/TclTk/lib\",\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\",\"../lib/FreeSurfer\",\"../lib/IGT\",\"../lib/ITKCommandIO\",\"../lib/LoadableModule\",\"../lib/MGHImageIO\",\"../lib/MRML\",\"../lib/ModuleDescriptionParser\",\"../lib/MRMLIDImageIO\",\"../lib/Qdec\",\"../lib/RemoteIO\",\"../lib/SlicerIO\",\"../lib/tclap\",\"../lib/vtkITK\",\"../lib/vtkTeem\"")
++ "\"../${Slicer3_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\",\"../lib/KWWidgets\",\"../lib/InsightToolkit\"")
+ if(Slicer3_BUILD_MODULES)
+ set(Slicer3_FORWARD_PATH_BUILD
+ "${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer3_INSTALL_MODULES_BIN_DIR}\"")
@@ -95,8 +95,10 @@
# --------------------------------------------------------------------------
# Find SLICERLIBCURL (slicercurl)
@@ -33,9 +86,21 @@
# --------------------------------------------------------------------------
# Include dirs
-diff -urNad slicer-3.3.0~svn8902~/Base/CLI/CMakeLists.txt slicer-3.3.0~svn8902/Base/CLI/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Base/CLI/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Base/CLI/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Applications/GUI/Slicer3.cxx slicer-3.3.0~svn8934/Applications/GUI/Slicer3.cxx
+--- slicer-3.3.0~svn8934~/Applications/GUI/Slicer3.cxx 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Applications/GUI/Slicer3.cxx 2009-03-25 20:35:36.000000000 -0400
+@@ -410,7 +410,7 @@
+ }
+
+ std::string tclEnv = "TCL_LIBRARY=";
+- tclEnv += slicerHome + "/lib/TclTk/lib/tcl" + Slicer3_TCL_TK_MAJOR_VERSION + "." + Slicer3_TCL_TK_MINOR_VERSION;
++ tclEnv += slicerHome + "/lib/tcl" + Slicer3_TCL_TK_MAJOR_VERSION + "." + Slicer3_TCL_TK_MINOR_VERSION;
+ vtkKWApplication::PutEnv(const_cast <char *> (tclEnv.c_str()));
+
+ // ITK factories dir
+diff -urNad slicer-3.3.0~svn8934~/Base/CLI/CMakeLists.txt slicer-3.3.0~svn8934/Base/CLI/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Base/CLI/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Base/CLI/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -58,6 +58,11 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} SlicerBaseCLI)
@@ -48,9 +113,9 @@
install(TARGETS SlicerBaseCLI
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.3.0~svn8902~/Base/GUI/CMakeLists.txt slicer-3.3.0~svn8902/Base/GUI/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Base/GUI/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Base/GUI/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Base/GUI/CMakeLists.txt slicer-3.3.0~svn8934/Base/GUI/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Base/GUI/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Base/GUI/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -177,6 +177,11 @@
RemoteIO
)
@@ -63,9 +128,9 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
-diff -urNad slicer-3.3.0~svn8902~/Base/Logic/CMakeLists.txt slicer-3.3.0~svn8902/Base/Logic/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Base/Logic/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Base/Logic/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Base/Logic/CMakeLists.txt slicer-3.3.0~svn8934/Base/Logic/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Base/Logic/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Base/Logic/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -115,6 +115,11 @@
slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
@@ -78,9 +143,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.3.0~svn8902~/CMakeLists.txt slicer-3.3.0~svn8902/CMakeLists.txt
---- slicer-3.3.0~svn8902~/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/CMakeLists.txt slicer-3.3.0~svn8934/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -27,6 +27,11 @@
set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
@@ -123,9 +188,9 @@
## BatchMake
option(Slicer3_USE_BatchMake "Build Slicer3 with BatchMake support." OFF)
-diff -urNad slicer-3.3.0~svn8902~/Libs/FreeSurfer/CMakeLists.txt slicer-3.3.0~svn8902/Libs/FreeSurfer/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/FreeSurfer/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/FreeSurfer/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/FreeSurfer/CMakeLists.txt slicer-3.3.0~svn8934/Libs/FreeSurfer/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/FreeSurfer/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/FreeSurfer/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -68,9 +68,14 @@
vtkIOTCL
)
@@ -142,9 +207,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Libs/IGT/CMakeLists.txt slicer-3.3.0~svn8902/Libs/IGT/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/IGT/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/IGT/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/IGT/CMakeLists.txt slicer-3.3.0~svn8934/Libs/IGT/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/IGT/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/IGT/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -139,9 +139,14 @@
${TRACKING_INTERFACE_LIB}
)
@@ -161,9 +226,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Libs/ITKCommandIO/CMakeLists.txt slicer-3.3.0~svn8902/Libs/ITKCommandIO/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/ITKCommandIO/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/ITKCommandIO/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/ITKCommandIO/CMakeLists.txt slicer-3.3.0~svn8934/Libs/ITKCommandIO/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/ITKCommandIO/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/ITKCommandIO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -71,9 +71,14 @@
ITKIO
)
@@ -180,9 +245,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Libs/LoadableModule/CMakeLists.txt slicer-3.3.0~svn8902/Libs/LoadableModule/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/LoadableModule/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/LoadableModule/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/LoadableModule/CMakeLists.txt slicer-3.3.0~svn8934/Libs/LoadableModule/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/LoadableModule/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/LoadableModule/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -116,9 +116,14 @@
target_link_libraries(${lib_name} ${link_libs})
@@ -199,9 +264,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Libs/MGHImageIO/CMakeLists.txt slicer-3.3.0~svn8902/Libs/MGHImageIO/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/MGHImageIO/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/MGHImageIO/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/MGHImageIO/CMakeLists.txt slicer-3.3.0~svn8934/Libs/MGHImageIO/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/MGHImageIO/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/MGHImageIO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -59,9 +59,14 @@
ITKIO
)
@@ -218,10 +283,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Libs/MRML/CMakeLists.txt slicer-3.3.0~svn8902/Libs/MRML/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/MRML/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/MRML/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
-@@ -237,6 +237,11 @@
+diff -urNad slicer-3.3.0~svn8934~/Libs/MRML/CMakeLists.txt slicer-3.3.0~svn8934/Libs/MRML/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/MRML/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/MRML/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+@@ -237,9 +237,14 @@
endif(MRML_USE_vtkTeem)
endif(MRML_USE_Teem)
@@ -232,10 +297,14 @@
+
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.3.0~svn8902~/Libs/MRMLIDImageIO/CMakeLists.txt slicer-3.3.0~svn8902/Libs/MRMLIDImageIO/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/MRMLIDImageIO/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/MRMLIDImageIO/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
+ )
+
+diff -urNad slicer-3.3.0~svn8934~/Libs/MRMLIDImageIO/CMakeLists.txt slicer-3.3.0~svn8934/Libs/MRMLIDImageIO/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/MRMLIDImageIO/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/MRMLIDImageIO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -78,9 +78,14 @@
vtkImaging
)
@@ -252,9 +321,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Libs/ModuleDescriptionParser/CMakeLists.txt slicer-3.3.0~svn8902/Libs/ModuleDescriptionParser/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/ModuleDescriptionParser/CMakeLists.txt slicer-3.3.0~svn8934/Libs/ModuleDescriptionParser/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/ModuleDescriptionParser/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -120,9 +120,14 @@
target_link_libraries(${lib_name} ${link_libs})
@@ -271,9 +340,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Libs/Qdec/CMakeLists.txt slicer-3.3.0~svn8902/Libs/Qdec/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/Qdec/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/Qdec/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/Qdec/CMakeLists.txt slicer-3.3.0~svn8934/Libs/Qdec/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/Qdec/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/Qdec/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -76,9 +76,14 @@
# vtkIOTCL
)
@@ -290,9 +359,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Libs/RemoteIO/CMakeLists.txt slicer-3.3.0~svn8902/Libs/RemoteIO/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/RemoteIO/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/RemoteIO/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/RemoteIO/CMakeLists.txt slicer-3.3.0~svn8934/Libs/RemoteIO/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/RemoteIO/CMakeLists.txt 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/RemoteIO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -11,8 +11,11 @@
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
@@ -328,9 +397,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.3.0~svn8902/Libs/RemoteIO/vtkHTTPHandler.h
---- slicer-3.3.0~svn8902~/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/RemoteIO/vtkHTTPHandler.h slicer-3.3.0~svn8934/Libs/RemoteIO/vtkHTTPHandler.h
+--- slicer-3.3.0~svn8934~/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-25 20:26:49.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/RemoteIO/vtkHTTPHandler.h 2009-03-25 20:35:36.000000000 -0400
@@ -5,7 +5,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -340,9 +409,21 @@
#include <vtkRemoteIOConfigure.h>
#include "vtkRemoteIO.h"
-diff -urNad slicer-3.3.0~svn8902~/Libs/vtkITK/CMakeLists.txt slicer-3.3.0~svn8902/Libs/vtkITK/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/vtkITK/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/vtkITK/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/SlicerIO/CMakeLists.txt slicer-3.3.0~svn8934/Libs/SlicerIO/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/SlicerIO/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/SlicerIO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+@@ -48,7 +48,7 @@
+
+ install(TARGETS ${lib_name}
+ RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
+- LIBRARY DESTINATION lib/${PROJECT_NAME} COMPONENT RuntimeLibraries
++ LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
+ )
+
+diff -urNad slicer-3.3.0~svn8934~/Libs/vtkITK/CMakeLists.txt slicer-3.3.0~svn8934/Libs/vtkITK/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/vtkITK/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/vtkITK/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -110,9 +110,14 @@
ITKDICOMParser
)
@@ -359,9 +440,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Libs/vtkTeem/CMakeLists.txt slicer-3.3.0~svn8902/Libs/vtkTeem/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Libs/vtkTeem/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Libs/vtkTeem/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Libs/vtkTeem/CMakeLists.txt slicer-3.3.0~svn8934/Libs/vtkTeem/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Libs/vtkTeem/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Libs/vtkTeem/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -111,9 +111,14 @@
${Teem_LIBRARIES}
)
@@ -378,9 +459,9 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-diff -urNad slicer-3.3.0~svn8902~/Modules/CMakeLists.txt slicer-3.3.0~svn8902/Modules/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/CMakeLists.txt slicer-3.3.0~svn8934/Modules/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -56,7 +56,7 @@
Statistics
Tractography
@@ -390,9 +471,9 @@
VolumeRendering
# WFEngineModule <- can't work with 2.6 and Win32??
# MRAblation <- not working either
-diff -urNad slicer-3.3.0~svn8902~/Modules/CommandLineModule/CMakeLists.txt slicer-3.3.0~svn8902/Modules/CommandLineModule/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/CommandLineModule/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/CommandLineModule/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/CommandLineModule/CMakeLists.txt slicer-3.3.0~svn8934/Modules/CommandLineModule/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/CommandLineModule/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/CommandLineModule/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -86,6 +86,11 @@
${ITK_LIBRARIES}
)
@@ -405,9 +486,9 @@
# Python settings
if(Slicer3_USE_PYTHON)
-diff -urNad slicer-3.3.0~svn8902~/Modules/EMSegment/CMakeLists.txt slicer-3.3.0~svn8902/Modules/EMSegment/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/EMSegment/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/EMSegment/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/EMSegment/CMakeLists.txt slicer-3.3.0~svn8934/Modules/EMSegment/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/EMSegment/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/EMSegment/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -176,6 +176,11 @@
Volumes
)
@@ -420,9 +501,24 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.3.0~svn8902~/Modules/Meshing/BuildingBlock/CMakeLists.txt slicer-3.3.0~svn8902/Modules/Meshing/BuildingBlock/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/Adapter/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/Adapter/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/Meshing/Adapter/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/Meshing/Adapter/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+@@ -58,6 +58,11 @@
+ ITKAlgorithms
+ )
+
++set_target_properties(${LIB_NAME} PROPERTIES
++ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++ VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
++
+ install(TARGETS ${LIB_NAME}
+ RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/BuildingBlock/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/BuildingBlock/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/Meshing/BuildingBlock/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -173,6 +173,11 @@
ITKIO
ITKAlgorithms
@@ -435,9 +531,9 @@
#CONFIGURE_FILE(
-diff -urNad slicer-3.3.0~svn8902~/Modules/Meshing/Common/CMakeLists.txt slicer-3.3.0~svn8902/Modules/Meshing/Common/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/Meshing/Common/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/Meshing/Common/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/Common/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/Common/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/Meshing/Common/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/Meshing/Common/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -156,6 +156,12 @@
MRML
)
@@ -451,9 +547,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.3.0~svn8902~/Modules/Meshing/Filter/CMakeLists.txt slicer-3.3.0~svn8902/Modules/Meshing/Filter/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/Meshing/Filter/CMakeLists.txt 2009-03-19 02:54:24.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/Meshing/Filter/CMakeLists.txt 2009-03-22 02:50:13.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/Filter/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/Filter/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/Meshing/Filter/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/Meshing/Filter/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -102,6 +102,11 @@
${KWWidgets_LIBRARIES}
)
@@ -466,9 +562,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.3.0~svn8902~/Modules/Meshing/IO/CMakeLists.txt slicer-3.3.0~svn8902/Modules/Meshing/IO/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/Meshing/IO/CMakeLists.txt 2009-03-19 02:54:24.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/Meshing/IO/CMakeLists.txt 2009-03-22 02:48:27.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/IO/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/IO/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/Meshing/IO/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/Meshing/IO/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -60,6 +60,11 @@
vtkRendering
)
@@ -481,9 +577,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.3.0~svn8902~/Modules/Meshing/Widgets/CMakeLists.txt slicer-3.3.0~svn8902/Modules/Meshing/Widgets/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/Meshing/Widgets/CMakeLists.txt 2009-03-19 02:54:24.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/Meshing/Widgets/CMakeLists.txt 2009-03-22 02:50:58.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/Meshing/Widgets/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Meshing/Widgets/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/Meshing/Widgets/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/Meshing/Widgets/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -107,6 +107,11 @@
mimxFilter
mimxCommon
@@ -496,9 +592,36 @@
install(TARGETS ${LIB_NAME}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
-diff -urNad slicer-3.3.0~svn8902~/Modules/QdecModule/CMakeLists.txt slicer-3.3.0~svn8902/Modules/QdecModule/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/QdecModule/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/QdecModule/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/OpenIGTLinkIF/CMakeLists.txt slicer-3.3.0~svn8934/Modules/OpenIGTLinkIF/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/OpenIGTLinkIF/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+@@ -84,6 +84,10 @@
+ )
+ slicer3_set_modules_output_path(${lib_name})
+
++set_target_properties(${lib_name} PROPERTIES
++ SOVERSION ${Slicer3_SHAREDLIB_SOVERSION}
++ VERSION ${Slicer3_SHAREDLIB_VERSION}
++)
+
+ target_link_libraries(${lib_name}
+ ${Slicer3_Libs_LIBRARIES}
+diff -urNad slicer-3.3.0~svn8934~/Modules/ProstateNav/CMakeLists.txt slicer-3.3.0~svn8934/Modules/ProstateNav/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/ProstateNav/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/ProstateNav/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
+@@ -17,6 +17,9 @@
+
+ # --------------------------------------------------------------------------
+ # Include dirs
++find_package(OpenIGTLink REQUIRED)
++
++include(${OpenIGTLink_USE_FILE})
+
+
+ #
+diff -urNad slicer-3.3.0~svn8934~/Modules/QdecModule/CMakeLists.txt slicer-3.3.0~svn8934/Modules/QdecModule/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/QdecModule/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/QdecModule/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -73,6 +73,11 @@
${ITK_LIBRARIES}
)
@@ -511,9 +634,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.3.0~svn8902~/Modules/ScriptedModule/CMakeLists.txt slicer-3.3.0~svn8902/Modules/ScriptedModule/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/ScriptedModule/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/ScriptedModule/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/ScriptedModule/CMakeLists.txt slicer-3.3.0~svn8934/Modules/ScriptedModule/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/ScriptedModule/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/ScriptedModule/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -68,6 +68,11 @@
${ITK_LIBRARIES}
)
@@ -526,9 +649,9 @@
# Python settings
if(Slicer3_USE_PYTHON)
-diff -urNad slicer-3.3.0~svn8902~/Modules/SlicerDaemon/CMakeLists.txt slicer-3.3.0~svn8902/Modules/SlicerDaemon/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/SlicerDaemon/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/SlicerDaemon/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/SlicerDaemon/CMakeLists.txt slicer-3.3.0~svn8934/Modules/SlicerDaemon/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/SlicerDaemon/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/SlicerDaemon/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -69,6 +69,11 @@
${ITK_LIBRARIES}
)
@@ -541,9 +664,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.3.0~svn8902~/Modules/Tractography/FiducialSeeding/CMakeLists.txt slicer-3.3.0~svn8902/Modules/Tractography/FiducialSeeding/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/Tractography/FiducialSeeding/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Tractography/FiducialSeeding/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -75,6 +75,11 @@
${ITK_LIBRARIES}
)
@@ -556,9 +679,9 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-diff -urNad slicer-3.3.0~svn8902~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt slicer-3.3.0~svn8902/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt slicer-3.3.0~svn8934/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -88,4 +88,9 @@
${ITK_LIBRARIES}
)
@@ -569,9 +692,9 @@
+)
+
slicer3_install_modules(${lib_name})
-diff -urNad slicer-3.3.0~svn8902~/Modules/Volumes/CMakeLists.txt slicer-3.3.0~svn8902/Modules/Volumes/CMakeLists.txt
---- slicer-3.3.0~svn8902~/Modules/Volumes/CMakeLists.txt 2009-03-22 02:46:12.000000000 +0000
-+++ slicer-3.3.0~svn8902/Modules/Volumes/CMakeLists.txt 2009-03-22 02:47:19.000000000 +0000
+diff -urNad slicer-3.3.0~svn8934~/Modules/Volumes/CMakeLists.txt slicer-3.3.0~svn8934/Modules/Volumes/CMakeLists.txt
+--- slicer-3.3.0~svn8934~/Modules/Volumes/CMakeLists.txt 2009-03-25 20:26:50.000000000 -0400
++++ slicer-3.3.0~svn8934/Modules/Volumes/CMakeLists.txt 2009-03-25 20:35:36.000000000 -0400
@@ -98,6 +98,11 @@
SlicerTractographyFiducialSeeding
)
Modified: packages/slicer/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/rules?rev=35605&op=diff
==============================================================================
--- packages/slicer/trunk/debian/rules (original)
+++ packages/slicer/trunk/debian/rules Thu Mar 26 01:15:41 2009
@@ -14,14 +14,15 @@
CMAKE_FLAGS = -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_CXX_FLAGS="-Wno-deprecated" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
- -DTEEM_DIR:PATH=/usr/lib/Teem-1.10.0 \
-DVOLUMERENDERINGMODULE:BOOL=ON \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DBUILD_TESTING:BOOL=OFF \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
-DSlicer3_USE_IGSTK:BOOL=OFF \
- -DSlicer3_USE_OPENIGTLINK:BOOL=OFF
+ -DSlicer3_USE_OPENIGTLINK:BOOL=ON \
+ -DSlicer3_USE_MIDAS:BOOL=ON \
+# -DTEEM_DIR:PATH=/usr/lib/Teem-1.10.0 \
CFLAGS = -g
@@ -64,6 +65,8 @@
# Add here commands to compile the package.
# export LD_LIBRARY_PATH=$(SHARED_BUILD_PATH)/bin/:$LD_LIBRARY_PATH
+# ldconfig
+ LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}:$(SHARED_BUILD_PATH)/bin/
# build shared libs and binaries
cd $(SHARED_BUILD_PATH) && $(MAKE) $(JOBS)
@@ -96,16 +99,23 @@
# install binaries and shared libs
cd $(SHARED_BUILD_PATH) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_install -plibslicer3 debian/tmp/usr/lib/lib*.so.* usr/lib
- dh_install -plibslicer3-dev debian/tmp/usr/lib/lib*.so usr/lib
- dh_install -plibslicer3 debian/tmp/usr/lib/Slicer3/lib*.so.* usr/lib
- dh_install -plibslicer3-dev debian/tmp/usr/lib/Slicer3/lib*.so usr/lib
+ dh_install -pslicer debian/tmp/usr/* usr
+
+# dh_install -plibslicer3 debian/tmp/usr/lib/lib*.so.* usr/lib
+# dh_install -plibslicer3-dev debian/tmp/usr/lib/lib*.so usr/lib
+# dh_install -plibslicer3 debian/tmp/usr/lib/Slicer3/lib*.so.* usr/lib
+# dh_install -plibslicer3-dev debian/tmp/usr/lib/Slicer3/lib*.so usr/lib
+# dh_install -plibslicer3 debian/tmp/usr/lib/Slicer3/Modules/lib*.so.* usr/lib
+# dh_install -plibslicer3-dev debian/tmp/usr/lib/Slicer3/Modules/lib*.so usr/lib
+
# dh_install -plibslicer3-dev debian/tmp/usr/lib/* usr/lib
- dh_install -plibslicer3-dev debian/tmp/usr/include/* usr/include
+# dh_install -plibslicer3-dev debian/tmp/usr/include/* usr/include
- dh_install -pslicer debian/tmp/usr/bin/* usr/bin
+# dh_install -pslicer debian/tmp/usr/bin/* usr/bin
+# dh_install -pslicer-share debian/tmp/usr/share/* usr/share/slicer/
+# LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}:$(SHARED_BUILD_PATH)/bin/
# Build architecture-independent files here.
@@ -138,7 +148,7 @@
# dh_perl
# dh_makeshlibs
dh_installdeb
- dh_shlibdeps
+ dh_shlibdeps -l $(CURDIR)/debian/tmp/usr/lib/:$(CURDIR)/debian/tmp/usr/lib/Slicer3/Modules/
dh_gencontrol
dh_md5sums
dh_builddeb
Modified: packages/slicer/trunk/debian/shlibs.local
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/shlibs.local?rev=35605&op=diff
==============================================================================
--- packages/slicer/trunk/debian/shlibs.local (original)
+++ packages/slicer/trunk/debian/shlibs.local Thu Mar 26 01:15:41 2009
@@ -23,3 +23,7 @@
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)
Added: packages/slicer/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/trunk/debian/watch?rev=35605&op=file
==============================================================================
--- packages/slicer/trunk/debian/watch (added)
+++ packages/slicer/trunk/debian/watch Thu Mar 26 01:15:41 2009
@@ -1,0 +1,5 @@
+version=3
+opts=uversionmangle=s/^/3.3.0~svn/ \
+http://viewvc.slicer.org/viewcvs.cgi/ ^/viewcvs.cgi\?rev=(\d+)&view=rev$
+#
+#http://viewvc.slicer.org/viewcvs.cgi/branches/Slicer-3-4/
More information about the debian-science-commits
mailing list