r36984 - /packages/slicer/branch/experimental/debian/patches/50_all_changes.diff
domibel-guest at users.alioth.debian.org
domibel-guest at users.alioth.debian.org
Sun Oct 31 16:09:39 UTC 2010
Author: domibel-guest
Date: Sun Oct 31 16:09:32 2010
New Revision: 36984
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36984
Log:
customized some SET_TARGET_PROPERTIES
Modified:
packages/slicer/branch/experimental/debian/patches/50_all_changes.diff
Modified: packages/slicer/branch/experimental/debian/patches/50_all_changes.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/slicer/branch/experimental/debian/patches/50_all_changes.diff?rev=36984&op=diff
==============================================================================
--- packages/slicer/branch/experimental/debian/patches/50_all_changes.diff (original)
+++ packages/slicer/branch/experimental/debian/patches/50_all_changes.diff Sun Oct 31 16:09:32 2010
@@ -1,10 +1,10 @@
## This patch adds soname version numbers
## MRIBiasFieldCorrection is using code from review, cant compile it
-Index: slicer-3.6.0~svn13936/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-06-29 03:03:06.489811994 +0000
-+++ slicer-3.6.0~svn13936/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-10-30 21:19:37.299280728 -0400
++++ slicer-3.6.2~svn15375/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -18,8 +18,8 @@
#
@@ -25,10 +25,10 @@
#
# Generate executable
-Index: slicer-3.6.0~svn13936/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
-===================================================================
---- slicer-3.6.0~svn13936.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-06-29 03:03:06.479808473 +0000
-+++ slicer-3.6.0~svn13936/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-10-30 21:19:37.315296541 -0400
++++ slicer-3.6.2~svn15375/Applications/CLI/MIDASApplications/DownloadSlicerTutorials/DownloadSlicerTutorials.cxx 2010-10-30 21:19:38.000000000 -0400
@@ -3,7 +3,7 @@
#endif
@@ -38,10 +38,10 @@
#include <itksys/SystemTools.hxx>
#include <itksys/Process.h>
#include <math.h>
-Index: slicer-3.6.0~svn13936/Applications/GUI/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Applications/GUI/CMakeLists.txt 2010-06-29 03:03:06.459771695 +0000
-+++ slicer-3.6.0~svn13936/Applications/GUI/CMakeLists.txt 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Applications/GUI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Applications/GUI/CMakeLists.txt 2010-10-30 21:19:37.331294022 -0400
++++ slicer-3.6.2~svn15375/Applications/GUI/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -45,7 +45,7 @@
set(Slicer3_FORWARD_PATH_BUILD
"\"${Slicer3_FORWARD_DIR_BUILD}\",\"${VTK_DIR}/bin\",\"${KWWidgets_RUNTIME_DIRS}\",\"${ITK_DIR}/bin\",\"${Teem_DIR}/bin\",\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\",\"${OPENGL_gl_LIBRARY_PATH}\"")
@@ -64,10 +64,10 @@
# --------------------------------------------------------------------------
# Include dirs
-Index: slicer-3.6.0~svn13936/Applications/GUI/Slicer3.cxx
-===================================================================
---- slicer-3.6.0~svn13936.orig/Applications/GUI/Slicer3.cxx 2010-06-29 03:03:06.449811498 +0000
-+++ slicer-3.6.0~svn13936/Applications/GUI/Slicer3.cxx 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Applications/GUI/Slicer3.cxx
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Applications/GUI/Slicer3.cxx 2010-10-30 21:19:37.347296313 -0400
++++ slicer-3.6.2~svn15375/Applications/GUI/Slicer3.cxx 2010-10-30 21:19:38.000000000 -0400
@@ -447,7 +447,7 @@
}
@@ -77,10 +77,10 @@
vtkKWApplication::PutEnv(const_cast <char *> (tclEnv.c_str()));
// ITK factories dir
-Index: slicer-3.6.0~svn13936/Libs/FreeSurfer/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/FreeSurfer/CMakeLists.txt 2010-06-29 03:03:06.439802342 +0000
-+++ slicer-3.6.0~svn13936/Libs/FreeSurfer/CMakeLists.txt 2010-06-29 03:28:27.749775231 +0000
+Index: slicer-3.6.2~svn15375/Libs/FreeSurfer/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/FreeSurfer/CMakeLists.txt 2010-10-30 21:19:37.115297363 -0400
++++ slicer-3.6.2~svn15375/Libs/FreeSurfer/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -95,7 +95,7 @@
install(TARGETS ${lib_name}
@@ -90,7 +90,7 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-@@ -125,9 +125,20 @@
+@@ -125,9 +125,22 @@
SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES SUFFIX ".pyd")
ENDIF(WIN32 AND NOT CYGWIN)
@@ -99,9 +99,11 @@
+ IF(Slicer3_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES
+ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
+ )
+ SET_TARGET_PROPERTIES(${lib_name}PythonD PROPERTIES
+ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
+ )
+ ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
@@ -112,10 +114,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.6.0~svn13936/Libs/IGT/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/IGT/CMakeLists.txt 2010-06-29 03:03:06.429809967 +0000
-+++ slicer-3.6.0~svn13936/Libs/IGT/CMakeLists.txt 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Libs/IGT/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/IGT/CMakeLists.txt 2010-10-30 21:19:36.979292996 -0400
++++ slicer-3.6.2~svn15375/Libs/IGT/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -157,7 +157,7 @@
install(TARGETS ${lib_name}
@@ -125,10 +127,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Libs/ITKCommandIO/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/ITKCommandIO/CMakeLists.txt 2010-06-29 03:03:06.419733537 +0000
-+++ slicer-3.6.0~svn13936/Libs/ITKCommandIO/CMakeLists.txt 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Libs/ITKCommandIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/ITKCommandIO/CMakeLists.txt 2010-10-30 21:19:36.995297646 -0400
++++ slicer-3.6.2~svn15375/Libs/ITKCommandIO/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -75,7 +75,7 @@
install(TARGETS ${lib_name}
@@ -138,10 +140,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Libs/LoadableModule/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/LoadableModule/CMakeLists.txt 2010-06-29 03:03:06.419733537 +0000
-+++ slicer-3.6.0~svn13936/Libs/LoadableModule/CMakeLists.txt 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Libs/LoadableModule/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/LoadableModule/CMakeLists.txt 2010-10-30 21:19:37.099280853 -0400
++++ slicer-3.6.2~svn15375/Libs/LoadableModule/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -127,7 +127,7 @@
install(TARGETS ${lib_name}
@@ -151,10 +153,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Libs/MGHImageIO/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/MGHImageIO/CMakeLists.txt 2010-06-29 03:03:06.409728408 +0000
-+++ slicer-3.6.0~svn13936/Libs/MGHImageIO/CMakeLists.txt 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Libs/MGHImageIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/MGHImageIO/CMakeLists.txt 2010-10-30 21:19:37.131295176 -0400
++++ slicer-3.6.2~svn15375/Libs/MGHImageIO/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -63,7 +63,7 @@
install(TARGETS ${lib_name}
@@ -164,10 +166,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Libs/MRML/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/MRML/CMakeLists.txt 2010-06-29 03:03:06.399830149 +0000
-+++ slicer-3.6.0~svn13936/Libs/MRML/CMakeLists.txt 2010-06-29 03:33:23.020255413 +0000
+Index: slicer-3.6.2~svn15375/Libs/MRML/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/MRML/CMakeLists.txt 2010-10-30 21:19:37.203298109 -0400
++++ slicer-3.6.2~svn15375/Libs/MRML/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -268,7 +268,7 @@
install(TARGETS ${lib_name}
@@ -177,7 +179,7 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-@@ -298,9 +298,19 @@
+@@ -298,9 +298,21 @@
SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES SUFFIX ".pyd")
ENDIF(WIN32 AND NOT CYGWIN)
@@ -185,9 +187,11 @@
+ IF(Slicer3_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES
+ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
+ )
+ SET_TARGET_PROPERTIES(${lib_name}PythonD PROPERTIES
+ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
+ )
+ ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
@@ -198,10 +202,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.6.0~svn13936/Libs/MRMLIDImageIO/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/MRMLIDImageIO/CMakeLists.txt 2010-06-29 03:03:06.379728672 +0000
-+++ slicer-3.6.0~svn13936/Libs/MRMLIDImageIO/CMakeLists.txt 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Libs/MRMLIDImageIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/MRMLIDImageIO/CMakeLists.txt 2010-10-30 21:19:37.023292776 -0400
++++ slicer-3.6.2~svn15375/Libs/MRMLIDImageIO/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -85,7 +85,7 @@
install(TARGETS ${lib_name}
@@ -211,10 +215,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Libs/RemoteIO/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/RemoteIO/CMakeLists.txt 2010-06-29 03:03:06.369796759 +0000
-+++ slicer-3.6.0~svn13936/Libs/RemoteIO/CMakeLists.txt 2010-06-29 03:32:31.259634729 +0000
+Index: slicer-3.6.2~svn15375/Libs/RemoteIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/RemoteIO/CMakeLists.txt 2010-10-30 21:19:37.175292960 -0400
++++ slicer-3.6.2~svn15375/Libs/RemoteIO/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -13,8 +13,11 @@
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
@@ -247,7 +251,7 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-@@ -153,9 +156,20 @@
+@@ -153,9 +156,22 @@
SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES SUFFIX ".pyd")
ENDIF(WIN32 AND NOT CYGWIN)
@@ -255,10 +259,12 @@
+ IF(Slicer3_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES
+ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
+ )
+ SET_TARGET_PROPERTIES(${lib_name}PythonD PROPERTIES
+ ${Slicer3_LIBRARY_PROPERTIES}
-+ )
++ LINK_INTERFACE_LIBRARIES ""
++ )
+ ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
+
@@ -269,10 +275,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.6.0~svn13936/Libs/RemoteIO/vtkHTTPHandler.h
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/RemoteIO/vtkHTTPHandler.h 2010-06-29 03:03:06.359832892 +0000
-+++ slicer-3.6.0~svn13936/Libs/RemoteIO/vtkHTTPHandler.h 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Libs/RemoteIO/vtkHTTPHandler.h
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/RemoteIO/vtkHTTPHandler.h 2010-10-30 21:19:37.187280784 -0400
++++ slicer-3.6.2~svn15375/Libs/RemoteIO/vtkHTTPHandler.h 2010-10-30 21:19:38.000000000 -0400
@@ -5,7 +5,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -282,10 +288,10 @@
#include <vtkRemoteIOConfigure.h>
#include "vtkRemoteIO.h"
-Index: slicer-3.6.0~svn13936/Libs/SlicerIO/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/SlicerIO/CMakeLists.txt 2010-06-29 03:03:06.349728642 +0000
-+++ slicer-3.6.0~svn13936/Libs/SlicerIO/CMakeLists.txt 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Libs/SlicerIO/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/SlicerIO/CMakeLists.txt 2010-10-30 21:19:37.219278346 -0400
++++ slicer-3.6.2~svn15375/Libs/SlicerIO/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -50,7 +50,7 @@
install(TARGETS ${lib_name}
@@ -295,11 +301,19 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Libs/vtkITK/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/vtkITK/CMakeLists.txt 2010-06-29 03:03:06.349728642 +0000
-+++ slicer-3.6.0~svn13936/Libs/vtkITK/CMakeLists.txt 2010-06-29 03:03:09.669578233 +0000
-@@ -151,7 +151,7 @@
+Index: slicer-3.6.2~svn15375/Libs/vtkITK/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/vtkITK/CMakeLists.txt 2010-10-30 21:19:37.143293878 -0400
++++ slicer-3.6.2~svn15375/Libs/vtkITK/CMakeLists.txt 2010-10-30 21:20:24.035391626 -0400
+@@ -75,7 +75,6 @@
+ vtkITKBSplineTransform.cxx
+ vtkITKTimeSeriesDatabase.cxx
+ vtkITKIslandMath.cxx
+- vtkITKGrowCutSegmentationImageFilter.cxx
+ )
+
+ # Abstract/pure virtual classes
+@@ -152,7 +151,7 @@
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
@@ -308,10 +322,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Libs/vtkTeem/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/vtkTeem/CMakeLists.txt 2010-06-29 03:03:06.329806023 +0000
-+++ slicer-3.6.0~svn13936/Libs/vtkTeem/CMakeLists.txt 2010-06-29 03:33:49.200411694 +0000
+Index: slicer-3.6.2~svn15375/Libs/vtkTeem/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/vtkTeem/CMakeLists.txt 2010-10-30 21:19:37.235279090 -0400
++++ slicer-3.6.2~svn15375/Libs/vtkTeem/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -136,7 +136,7 @@
install(TARGETS ${lib_name}
@@ -321,7 +335,7 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-@@ -166,9 +166,19 @@
+@@ -166,9 +166,21 @@
SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES SUFFIX ".pyd")
ENDIF(WIN32 AND NOT CYGWIN)
@@ -329,9 +343,11 @@
+ IF(Slicer3_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(${lib_name}Python PROPERTIES
+ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
+ )
+ SET_TARGET_PROPERTIES(${lib_name}PythonD PROPERTIES
+ ${Slicer3_LIBRARY_PROPERTIES}
++ LINK_INTERFACE_LIBRARIES ""
+ )
+ ENDIF(Slicer3_LIBRARY_PROPERTIES)
+
@@ -342,10 +358,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development)
ENDIF(VTK_WRAP_PYTHON AND BUILD_SHARED_LIBS)
-Index: slicer-3.6.0~svn13936/Modules/ChangeTracker/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/ChangeTracker/CMakeLists.txt 2010-06-29 03:03:06.269740918 +0000
-+++ slicer-3.6.0~svn13936/Modules/ChangeTracker/CMakeLists.txt 2010-06-29 03:03:09.669578233 +0000
+Index: slicer-3.6.2~svn15375/Modules/ChangeTracker/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/ChangeTracker/CMakeLists.txt 2010-10-30 21:19:37.767296483 -0400
++++ slicer-3.6.2~svn15375/Modules/ChangeTracker/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -44,8 +44,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -355,10 +371,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/CommandLineModule/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/CommandLineModule/CMakeLists.txt 2010-06-29 03:03:06.259728601 +0000
-+++ slicer-3.6.0~svn13936/Modules/CommandLineModule/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Modules/CommandLineModule/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/CommandLineModule/CMakeLists.txt 2010-10-30 21:19:37.487284735 -0400
++++ slicer-3.6.2~svn15375/Modules/CommandLineModule/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -368,10 +384,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/FetchMI/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/FetchMI/CMakeLists.txt 2010-06-29 03:03:06.249730670 +0000
-+++ slicer-3.6.0~svn13936/Modules/FetchMI/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Modules/FetchMI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/FetchMI/CMakeLists.txt 2010-10-30 21:19:37.543279317 -0400
++++ slicer-3.6.2~svn15375/Modules/FetchMI/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -44,8 +44,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -381,10 +397,24 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-06-29 03:03:06.239670279 +0000
-+++ slicer-3.6.0~svn13936/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+@@ -93,6 +91,13 @@
+ Volumes
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15375/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-10-30 21:19:37.587280944 -0400
++++ slicer-3.6.2~svn15375/Modules/GradientAnisotropicDiffusionFilter/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -41,8 +41,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -394,10 +424,24 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/Meshing/IA_FEMesh/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-06-29 03:03:06.229602664 +0000
-+++ slicer-3.6.0~svn13936/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+@@ -106,6 +104,13 @@
+ ${ITK_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15375/Modules/Meshing/IA_FEMesh/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-10-30 21:19:37.559282476 -0400
++++ slicer-3.6.2~svn15375/Modules/Meshing/IA_FEMesh/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -46,8 +46,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -407,10 +451,22 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/NeuroNav/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/NeuroNav/CMakeLists.txt 2010-06-29 03:03:06.209603070 +0000
-+++ slicer-3.6.0~svn13936/Modules/NeuroNav/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+@@ -104,4 +102,11 @@
+ BuildingBlock
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${LIB_NAME})
+Index: slicer-3.6.2~svn15375/Modules/NeuroNav/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/NeuroNav/CMakeLists.txt 2010-10-30 21:19:37.599280203 -0400
++++ slicer-3.6.2~svn15375/Modules/NeuroNav/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -41,8 +41,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -420,10 +476,24 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/OpenIGTLinkIF/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-06-29 03:03:06.199604941 +0000
-+++ slicer-3.6.0~svn13936/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+@@ -89,6 +87,13 @@
+ ${ITK_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+
+Index: slicer-3.6.2~svn15375/Modules/OpenIGTLinkIF/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-10-30 21:19:37.711296750 -0400
++++ slicer-3.6.2~svn15375/Modules/OpenIGTLinkIF/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -42,8 +42,6 @@
)
@@ -433,10 +503,25 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-06-29 03:03:06.199604941 +0000
-+++ slicer-3.6.0~svn13936/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-06-29 03:03:09.679606030 +0000
+@@ -95,6 +93,14 @@
+ ${ITK_LIBRARIES}
+ ${OpenIGTLink_LIBRARIES}
+ )
++
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15375/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-10-30 21:19:37.471278233 -0400
++++ slicer-3.6.2~svn15375/Modules/ProstateNav/Wizard/vtkProstateNavCalibrationStep.h 2010-10-30 21:19:38.000000000 -0400
@@ -31,6 +31,13 @@
class VTK_PROSTATENAV_EXPORT vtkProstateNavCalibrationStep : public vtkProstateNavStep
{
@@ -451,10 +536,10 @@
static vtkProstateNavCalibrationStep *New();
vtkTypeRevisionMacro(vtkProstateNavCalibrationStep,vtkProstateNavStep);
void PrintSelf(ostream& os, vtkIndent indent);
-Index: slicer-3.6.0~svn13936/Modules/QueryAtlas/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/QueryAtlas/CMakeLists.txt 2010-06-29 03:03:06.179623153 +0000
-+++ slicer-3.6.0~svn13936/Modules/QueryAtlas/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Modules/QueryAtlas/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/QueryAtlas/CMakeLists.txt 2010-10-30 21:19:37.699294974 -0400
++++ slicer-3.6.2~svn15375/Modules/QueryAtlas/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -42,14 +42,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -470,7 +555,21 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
-@@ -203,14 +200,14 @@
+@@ -110,6 +107,13 @@
+ ${ITK_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+@@ -203,14 +207,14 @@
OntologyViz/extjars/prefuse.jar
)
@@ -496,10 +595,10 @@
+# DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR}/${PROJECT_NAME}/${path} COMPONENT Development
+# )
+#endforeach(file)
-Index: slicer-3.6.0~svn13936/Modules/RealTimeImaging/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/RealTimeImaging/CMakeLists.txt 2010-06-29 03:03:06.179623153 +0000
-+++ slicer-3.6.0~svn13936/Modules/RealTimeImaging/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Modules/RealTimeImaging/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/RealTimeImaging/CMakeLists.txt 2010-10-30 21:19:37.739291054 -0400
++++ slicer-3.6.2~svn15375/Modules/RealTimeImaging/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -34,7 +34,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -508,10 +607,10 @@
"${CMAKE_CURRENT_BINARY_DIR}/vtkRealTimeImagingConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/ScriptedModule/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/ScriptedModule/CMakeLists.txt 2010-06-29 03:03:06.169592768 +0000
-+++ slicer-3.6.0~svn13936/Modules/ScriptedModule/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Modules/ScriptedModule/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/ScriptedModule/CMakeLists.txt 2010-10-30 21:19:37.727286040 -0400
++++ slicer-3.6.2~svn15375/Modules/ScriptedModule/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -529,10 +628,10 @@
# Python settings
if(Slicer3_USE_PYTHON)
-Index: slicer-3.6.0~svn13936/Modules/SlicerDaemon/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/SlicerDaemon/CMakeLists.txt 2010-06-29 03:03:06.159636158 +0000
-+++ slicer-3.6.0~svn13936/Modules/SlicerDaemon/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Modules/SlicerDaemon/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/SlicerDaemon/CMakeLists.txt 2010-10-30 21:19:37.499278353 -0400
++++ slicer-3.6.2~svn15375/Modules/SlicerDaemon/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -550,10 +649,10 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-Index: slicer-3.6.0~svn13936/Modules/SlicerWelcome/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/SlicerWelcome/CMakeLists.txt 2010-06-29 03:03:06.149623336 +0000
-+++ slicer-3.6.0~svn13936/Modules/SlicerWelcome/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Modules/SlicerWelcome/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/SlicerWelcome/CMakeLists.txt 2010-10-30 21:19:37.751296673 -0400
++++ slicer-3.6.2~svn15375/Modules/SlicerWelcome/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -39,8 +39,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -563,10 +662,23 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/Statistics/LabelStatistics/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-06-29 03:03:06.139605671 +0000
-+++ slicer-3.6.0~svn13936/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+@@ -82,5 +80,12 @@
+ ${KWWidgets_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+Index: slicer-3.6.2~svn15375/Modules/Statistics/LabelStatistics/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-10-30 21:19:37.571293740 -0400
++++ slicer-3.6.2~svn15375/Modules/Statistics/LabelStatistics/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -576,10 +688,24 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/Tractography/Display/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/Tractography/Display/CMakeLists.txt 2010-06-29 03:03:06.129573779 +0000
-+++ slicer-3.6.0~svn13936/Modules/Tractography/Display/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+@@ -75,6 +73,13 @@
+ ${ITK_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15375/Modules/Tractography/Display/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/Tractography/Display/CMakeLists.txt 2010-10-30 21:19:37.515281333 -0400
++++ slicer-3.6.2~svn15375/Modules/Tractography/Display/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -33,14 +33,11 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -595,10 +721,22 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/Tractography/FiducialSeeding/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-06-29 03:03:06.119601683 +0000
-+++ slicer-3.6.0~svn13936/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+@@ -87,4 +84,11 @@
+ ${ITK_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+Index: slicer-3.6.2~svn15375/Modules/Tractography/FiducialSeeding/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-10-30 21:19:37.527278459 -0400
++++ slicer-3.6.2~svn15375/Modules/Tractography/FiducialSeeding/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -35,8 +35,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -616,10 +754,10 @@
slicer3_install_modules(${lib_name})
# --------------------------------------------------------------------------
-Index: slicer-3.6.0~svn13936/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-06-29 03:03:06.109578535 +0000
-+++ slicer-3.6.0~svn13936/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-10-30 21:19:37.643280332 -0400
++++ slicer-3.6.2~svn15375/Modules/VolumeRendering/VolumeRenderingReplacements/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -33,8 +33,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -629,10 +767,10 @@
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/Volumes/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/Volumes/CMakeLists.txt 2010-06-29 03:03:06.099573490 +0000
-+++ slicer-3.6.0~svn13936/Modules/Volumes/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Modules/Volumes/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/Volumes/CMakeLists.txt 2010-10-30 21:19:37.439278548 -0400
++++ slicer-3.6.2~svn15375/Modules/Volumes/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -48,7 +48,6 @@
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
@@ -641,10 +779,10 @@
"${CMAKE_CURRENT_BINARY_DIR}/vtkVolumesConfigure.h"
DESTINATION ${Slicer3_INSTALL_MODULES_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Scripts/versioner.tcl
-===================================================================
---- slicer-3.6.0~svn13936.orig/Scripts/versioner.tcl 2010-06-29 03:03:06.079571637 +0000
-+++ slicer-3.6.0~svn13936/Scripts/versioner.tcl 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Scripts/versioner.tcl
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Scripts/versioner.tcl 2010-10-30 21:19:37.783280120 -0400
++++ slicer-3.6.2~svn15375/Scripts/versioner.tcl 2010-10-30 21:19:38.000000000 -0400
@@ -14,15 +14,6 @@
# Initiated - sp - 2009-03-24
#
@@ -694,14 +832,14 @@
-set versionText "${versionText}svnurl $svn(URL)\n"
-set versionText "${versionText}svnrevision $svn(revision)\n"
+set versionText "${versionText}svnurl http://svn.slicer.org/Slicer3/trunk\n"
-+set versionText "${versionText}svnrevision 10335\n"
++set versionText "${versionText}svnrevision 14971\n"
set versionFile $::Slicer3_BUILD/lib/Slicer3/Slicer3Version.txt
puts "Writing version information to $versionFile"
-Index: slicer-3.6.0~svn13936/Applications/CLI/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Applications/CLI/CMakeLists.txt 2010-06-29 03:03:06.469800300 +0000
-+++ slicer-3.6.0~svn13936/Applications/CLI/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Applications/CLI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Applications/CLI/CMakeLists.txt 2010-10-30 21:19:37.283280617 -0400
++++ slicer-3.6.2~svn15375/Applications/CLI/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -313,7 +313,7 @@
slicer3_set_plugins_output_path(${CLP})
target_link_libraries (${CLP} ${CLP}Lib)
@@ -711,12 +849,12 @@
#####################
# set (CLP DWIDicomLoad)
-@@ -679,14 +679,14 @@
+@@ -703,14 +703,14 @@
###################
SET(cli_modules
- MRIBiasFieldCorrection
-+# MRIBiasFieldCorrection
++ #MRIBiasFieldCorrection
SparseFieldLevelSetContour
Realign
DiffusionApplications
@@ -724,55 +862,37 @@
ExtractSkeleton
#Java
- N4ITKBiasFieldCorrection
-+# N4ITKBiasFieldCorrection
++ #N4ITKBiasFieldCorrection
RobustStatisticsSegmenter
)
-@@ -696,11 +696,11 @@
+@@ -720,11 +720,11 @@
else ( ${ITK_VERSION_MAJOR} GREATER 3 )
- if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
-+ if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 16 )
++ if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 20 )
SET(cli_modules ${cli_modules} RegisterImagesModule)
- else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
-+ else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 16 )
++ else ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 20 )
if ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
if ( ITK_USE_OPTIMIZED_REGISTRATION_METHODS )
-@@ -712,7 +712,7 @@
+@@ -736,7 +736,7 @@
message ("RegisterImagesModule requires ITK version 3.8 or higher")
endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 6 )
- endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 12 )
-+ endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 16 )
++ endif ( ${ITK_VERSION_MAJOR} MATCHES 3 AND ${ITK_VERSION_MINOR} GREATER 20 )
endif ( ${ITK_VERSION_MAJOR} GREATER 3 )
-Index: slicer-3.6.0~svn13936/Modules/Meshing/Filter/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/Meshing/Filter/CMakeLists.txt 2010-06-29 03:03:06.219733482 +0000
-+++ slicer-3.6.0~svn13936/Modules/Meshing/Filter/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
-@@ -95,6 +95,13 @@
- mimxCommon
- )
-
-+# Apply user-defined properties to the library target.
-+IF(Slicer3_LIBRARY_PROPERTIES)
-+ SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
-+ ${Slicer3_LIBRARY_PROPERTIES}
-+ )
-+ENDIF(Slicer3_LIBRARY_PROPERTIES)
-+
- install(TARGETS ${LIB_NAME}
- RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
-Index: slicer-3.6.0~svn13936/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/CMakeLists.txt 2010-06-29 03:03:06.069573773 +0000
-+++ slicer-3.6.0~svn13936/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/CMakeLists.txt 2010-10-30 21:19:36.967295685 -0400
++++ slicer-3.6.2~svn15375/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -29,6 +29,11 @@
set(Slicer3_HOME "${Slicer3_BINARY_DIR}")
@@ -810,10 +930,10 @@
endif(Slicer3_USE_OPENIGTLINK)
#-----------------------------------------------------------------------------
-Index: slicer-3.6.0~svn13936/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-06-29 03:03:06.339728707 +0000
-+++ slicer-3.6.0~svn13936/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-10-30 21:19:37.159278861 -0400
++++ slicer-3.6.2~svn15375/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h 2010-10-30 21:19:38.000000000 -0400
@@ -34,7 +34,7 @@
#include <string>
@@ -823,49 +943,10 @@
#include "gdcmDict.h" /// access to dictionary
#include "gdcmDictEntry.h" /// access to dictionary
#include "gdcmGlobal.h" /// access to dictionary
-Index: slicer-3.6.0~svn13936/Libs/MRML/vtkMRMLCameraNode.cxx
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/MRML/vtkMRMLCameraNode.cxx 2010-06-29 03:03:06.389733396 +0000
-+++ slicer-3.6.0~svn13936/Libs/MRML/vtkMRMLCameraNode.cxx 2010-06-29 03:03:09.679606030 +0000
-@@ -77,7 +77,11 @@
- {
- if (this->Camera)
- {
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ this->Camera->SetUserTransform(NULL);
-+#else
- this->Camera->SetUserViewTransform(NULL);
-+#endif
- }
- this->SetAndObserveCamera(NULL);
- delete [] this->InternalActiveTag;
-@@ -291,12 +295,21 @@
- tnode == vtkMRMLTransformNode::SafeDownCast(caller) &&
- event == vtkMRMLTransformableNode::TransformModifiedEvent)
- {
-- vtkTransform *user_transform =
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ vtkTransform *user_transform =
-+ vtkTransform::SafeDownCast(this->Camera->GetUserTransform());
-+#else
-+ vtkTransform *user_transform =
- vtkTransform::SafeDownCast(this->Camera->GetUserViewTransform());
-+#endif
- if (!user_transform)
- {
- user_transform = vtkTransform::New();
-+#if ( (VTK_MAJOR_VERSION >= 6) || ( VTK_MAJOR_VERSION == 5 && VTK_MINOR_VERSION >= 4 ) )
-+ this->Camera->SetUserTransform(user_transform);
-+#else
- this->Camera->SetUserViewTransform(user_transform);
-+#endif
- user_transform->Delete();
- }
- vtkSmartPointer<vtkMatrix4x4> transformToWorld = vtkSmartPointer<vtkMatrix4x4>::New();
-Index: slicer-3.6.0~svn13936/CMake/Slicer3FindQT.cmake
-===================================================================
---- slicer-3.6.0~svn13936.orig/CMake/Slicer3FindQT.cmake 2010-06-29 03:03:06.059596819 +0000
-+++ slicer-3.6.0~svn13936/CMake/Slicer3FindQT.cmake 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/CMake/Slicer3FindQT.cmake
+===================================================================
+--- slicer-3.6.2~svn15375.orig/CMake/Slicer3FindQT.cmake 2010-10-30 21:19:37.271281045 -0400
++++ slicer-3.6.2~svn15375/CMake/Slicer3FindQT.cmake 2010-10-30 21:19:38.000000000 -0400
@@ -9,37 +9,37 @@
IF(Slicer3_USE_QT)
@@ -919,10 +1000,10 @@
ENDIF(Slicer3_USE_QT)
ENDMACRO(Slicer3_SETUP_QT)
-Index: slicer-3.6.0~svn13936/Libs/MRMLCLI/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/MRMLCLI/CMakeLists.txt 2010-06-29 03:03:06.319728153 +0000
-+++ slicer-3.6.0~svn13936/Libs/MRMLCLI/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Libs/MRMLCLI/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/MRMLCLI/CMakeLists.txt 2010-10-30 21:19:37.007280175 -0400
++++ slicer-3.6.2~svn15375/Libs/MRMLCLI/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -103,7 +103,7 @@
INSTALL(TARGETS ${lib_name}
@@ -932,10 +1013,10 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Utilities/Launcher/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Utilities/Launcher/CMakeLists.txt 2010-06-29 03:03:06.049577403 +0000
-+++ slicer-3.6.0~svn13936/Utilities/Launcher/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Utilities/Launcher/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Utilities/Launcher/CMakeLists.txt 2010-10-30 21:19:37.255300473 -0400
++++ slicer-3.6.2~svn15375/Utilities/Launcher/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -39,7 +39,7 @@
"${CMAKE_CURRENT_SOURCE_DIR}/Slicer3Launchers/${launcher_name}")
@@ -954,10 +1035,10 @@
endif(EXISTS "${launcher_source}")
# Should this location change, change Application/GUI/Slicer3.cxx as well
-Index: slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-06-29 03:03:06.309732742 +0000
-+++ slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-10-30 21:19:37.067292693 -0400
++++ slicer-3.6.2~svn15375/Libs/SlicerExecutionModel/GenerateCLP/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -13,10 +13,10 @@
include(${ModuleDescriptionParser_USE_FILE})
endif(ModuleDescriptionParser_FOUND)
@@ -973,10 +1054,10 @@
find_package(ITK REQUIRED)
if(ITK_FOUND)
-Index: slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-06-29 03:03:06.299733427 +0000
-+++ slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-10-30 21:19:37.083280384 -0400
++++ slicer-3.6.2~svn15375/Libs/SlicerExecutionModel/GenerateCLP/UseGenerateCLP.cmake.in 2010-10-30 21:19:38.000000000 -0400
@@ -5,10 +5,10 @@
message(FATAL_ERROR "Cannot build without ITK. Please set ITK_DIR.")
endif(ITK_FOUND)
@@ -992,10 +1073,10 @@
find_package(ModuleDescriptionParser REQUIRED)
if(ModuleDescriptionParser_FOUND)
-Index: slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-06-29 03:03:06.289728171 +0000
-+++ slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-10-30 21:19:37.039329034 -0400
++++ slicer-3.6.2~svn15375/Libs/SlicerExecutionModel/ModuleDescriptionParser/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -132,7 +132,7 @@
install(TARGETS ${lib_name}
@@ -1005,11 +1086,11 @@
ARCHIVE DESTINATION lib/${PROJECT_NAME} COMPONENT Development
)
-Index: slicer-3.6.0~svn13936/Modules/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Modules/CMakeLists.txt 2010-06-29 03:03:06.089578909 +0000
-+++ slicer-3.6.0~svn13936/Modules/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
-@@ -63,14 +63,14 @@
+Index: slicer-3.6.2~svn15375/Modules/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/CMakeLists.txt 2010-10-30 21:19:37.455302231 -0400
++++ slicer-3.6.2~svn15375/Modules/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
+@@ -63,7 +63,7 @@
Tractography
# TumorGrowth
Volumes
@@ -1018,14 +1099,6 @@
VolumeRendering
# VolumeRendering1 <- merged into VolumeRendering
# WFEngineModule <- can't work with 2.6 and Win32??
- # MRAblation <- not working either
- ModelMirror
- ModelTransform
-- EMSegment
-+# EMSegment
- # DistanceTransformModel <- culled from slicer 3.6
- ClipModel
- Measurements
@@ -82,7 +82,7 @@
# ExtractSubvolumeROI <- renamed to CropVolume
CropVolume
@@ -1044,10 +1117,10 @@
# IGTNavigation
# OpenCV
)
-Index: slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Libs/SlicerExecutionModel/CMakeLists.txt 2010-06-29 03:03:06.279729959 +0000
-+++ slicer-3.6.0~svn13936/Libs/SlicerExecutionModel/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Libs/SlicerExecutionModel/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Libs/SlicerExecutionModel/CMakeLists.txt 2010-10-30 21:19:37.051288200 -0400
++++ slicer-3.6.2~svn15375/Libs/SlicerExecutionModel/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -30,8 +30,8 @@
###
@@ -1059,10 +1132,10 @@
SETIFEMPTY(ModuleDescriptionParser_DIR ${CMAKE_CURRENT_BINARY_DIR}/ModuleDescriptionParser CACHE PATH "Location of ModuleDescriptionParserConfig.cmake" FORCE)
ADD_SUBDIRECTORY(ModuleDescriptionParser)
-Index: slicer-3.6.0~svn13936/Base/GUI/Python/CMakeLists.txt
-===================================================================
---- slicer-3.6.0~svn13936.orig/Base/GUI/Python/CMakeLists.txt 2010-06-29 03:03:06.039606523 +0000
-+++ slicer-3.6.0~svn13936/Base/GUI/Python/CMakeLists.txt 2010-06-29 03:03:09.679606030 +0000
+Index: slicer-3.6.2~svn15375/Base/GUI/Python/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Base/GUI/Python/CMakeLists.txt 2010-10-30 21:19:37.375296319 -0400
++++ slicer-3.6.2~svn15375/Base/GUI/Python/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
@@ -87,6 +87,11 @@
target_link_libraries( ${lib_name} ${PYTHON_LIBRARIES})
endif (WIN32 AND PYTHON_DEBUG_LIBRARIES)
@@ -1075,3 +1148,287 @@
install(TARGETS ${lib_name}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.6.2~svn15375/Modules/Measurements/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/Measurements/CMakeLists.txt 2010-10-30 21:19:37.683296664 -0400
++++ slicer-3.6.2~svn15375/Modules/Measurements/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
+@@ -87,6 +87,13 @@
+ ${KWWidgets_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15375/Modules/ModelTransform/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/ModelTransform/CMakeLists.txt 2010-10-30 21:19:37.615294114 -0400
++++ slicer-3.6.2~svn15375/Modules/ModelTransform/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
+@@ -87,6 +87,13 @@
+ Volumes
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15375/Modules/ModelMirror/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/ModelMirror/CMakeLists.txt 2010-10-30 21:19:37.627282422 -0400
++++ slicer-3.6.2~svn15375/Modules/ModelMirror/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
+@@ -88,6 +88,13 @@
+ Volumes
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ slicer3_install_modules(${lib_name})
+
+ # --------------------------------------------------------------------------
+Index: slicer-3.6.2~svn15375/Modules/FourDImage/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/FourDImage/CMakeLists.txt 2010-10-30 21:19:37.671294132 -0400
++++ slicer-3.6.2~svn15375/Modules/FourDImage/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
+@@ -105,6 +105,13 @@
+ ${VolumesLib}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ install(TARGETS ${lib_name}
+ RUNTIME DESTINATION ${Slicer3_INSTALL_MODULES_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.6.2~svn15375/Modules/IGTToolSelector/CMakeLists.txt
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Modules/IGTToolSelector/CMakeLists.txt 2010-10-30 21:19:37.655293504 -0400
++++ slicer-3.6.2~svn15375/Modules/IGTToolSelector/CMakeLists.txt 2010-10-30 21:19:38.000000000 -0400
+@@ -82,6 +82,13 @@
+ ${KWWidgets_LIBRARIES}
+ )
+
++# Apply user-defined properties to the library target.
++IF(Slicer3_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
++ ${Slicer3_LIBRARY_PROPERTIES}
++ )
++ENDIF(Slicer3_LIBRARY_PROPERTIES)
++
+ install(TARGETS ${lib_name}
+ RUNTIME DESTINATION ${Slicer3_INSTALL_MODULES_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${Slicer3_INSTALL_MODULES_LIB_DIR} COMPONENT RuntimeLibraries
+Index: slicer-3.6.2~svn15375/Base/GUI/Tcl/LoadVolume.tcl
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Base/GUI/Tcl/LoadVolume.tcl 2010-10-30 21:19:37.395279314 -0400
++++ slicer-3.6.2~svn15375/Base/GUI/Tcl/LoadVolume.tcl 2010-10-30 21:19:38.000000000 -0400
+@@ -1081,6 +1081,7 @@
+ }
+ set dicomDict ""
+ set dicomDictCandidates [list \
++ /usr/lib/Slicer3/gdcm/Dicts/gdcm.dic \
+ $::Slicer3_BUILD/include/InsightToolkit/gdcm/Dicts/gdcm.dic \
+ $itkBinDir/../../include/InsightToolkit/gdcm/Dicts/gdcm.dic \
+ $itkBinDir/../Utilities/gdcm/Dicts/gdcm.dic \
+Index: slicer-3.6.2~svn15375/Base/Logic/vtkSlicerTransformLogic.cxx
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Base/Logic/vtkSlicerTransformLogic.cxx 2010-10-30 21:19:37.423280219 -0400
++++ slicer-3.6.2~svn15375/Base/Logic/vtkSlicerTransformLogic.cxx 2010-10-30 21:19:38.000000000 -0400
+@@ -7,8 +7,8 @@
+
+ Program: 3D Slicer
+ Module: $RCSfile: vtkSlicerTransformLogic.cxx,v $
+- Date: $Date: 2010-07-01 17:27:45 -0400 (Thu, 01 Jul 2010) $
+- Version: $Revision: 14011 $
++ Date: $Date: 2010-04-13 15:19:58 +0000 (Tue, 13 Apr 2010) $
++ Version: $Revision: 12724 $
+
+ =========================================================================auto=*/
+
+@@ -27,32 +27,7 @@
+
+ #include "vtkStringArray.h"
+
+-#include "itkAffineTransform.h"
+-#include "itkBSplineDeformableTransform.h"
+-#include "itkCenteredAffineTransform.h"
+-#include "itkCenteredEuler3DTransform.h"
+-#include "itkCenteredRigid2DTransform.h"
+-#include "itkCenteredSimilarity2DTransform.h"
+-#include "itkEuler2DTransform.h"
+-#include "itkEuler3DTransform.h"
+-#include "itkFixedCenterOfRotationAffineTransform.h"
+-#include "itkIdentityTransform.h"
+-#include "itkQuaternionRigidTransform.h"
+-#include "itkRigid2DTransform.h"
+-#include "itkRigid3DPerspectiveTransform.h"
+-#include "itkRigid3DTransform.h"
+-#include "itkScalableAffineTransform.h"
+-#include "itkScaleLogarithmicTransform.h"
+-#include "itkScaleSkewVersor3DTransform.h"
+-#include "itkScaleTransform.h"
+-#include "itkScaleVersor3DTransform.h"
+-#include "itkSimilarity2DTransform.h"
+-#include "itkTranslationTransform.h"
+-#include "itkVersorRigid3DTransform.h"
+-#include "itkVersorTransform.h"
+-#include "itkTransformFactory.h"
+-
+-vtkCxxRevisionMacro(vtkSlicerTransformLogic, "$Revision: 14011 $");
++vtkCxxRevisionMacro(vtkSlicerTransformLogic, "$Revision: 12724 $");
+ vtkStandardNewMacro(vtkSlicerTransformLogic);
+
+ //----------------------------------------------------------------------------
+@@ -160,73 +135,3 @@
+ {
+ return 1;
+ }
+-
+- // Register transform types with ITK factory
+- // This code is from Applications/CLI/BRAINSTools/BRAINSCommonLib/GenericTransformImage.cxx
+- // We do this in order to register ScaleVersor3DTransform, which is not done
+- // in ITK 3.18. The rest of transforms need to be re-registered when a new
+- // transform is added. TODO: this must be revised in 3.20, hopefully
+- // ScaleVersor3DTransform will be out of Review by then
+- void vtkSlicerTransformLogic::RegisterITKTransforms(){
+- //This is needed in order to read and write ScaleVersor3D TransformTypes.
+- //Hopefully in ITK-3-19 this will become part of the non-review transform types.
+- itk::TransformFactory<itk::ScaleVersor3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleVersor3DTransform<float> >::RegisterTransform ();
+-
+- itk::TransformFactory<itk::AffineTransform<double,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::AffineTransform<double,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::BSplineDeformableTransform<double,2,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::BSplineDeformableTransform<double,3,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredAffineTransform<double,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredAffineTransform<double,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredEuler3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredRigid2DTransform < double > >::RegisterTransform();
+- itk::TransformFactory<itk::CenteredSimilarity2DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Similarity2DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Euler2DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Euler3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::FixedCenterOfRotationAffineTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::IdentityTransform<double,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::IdentityTransform<double,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::QuaternionRigidTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid2DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid3DPerspectiveTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScalableAffineTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleLogarithmicTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleSkewVersor3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<double,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<double,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<double,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::TranslationTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::VersorRigid3DTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::VersorTransform<double> >::RegisterTransform ();
+- itk::TransformFactory<itk::AffineTransform<float,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::AffineTransform<float,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::BSplineDeformableTransform<float,2,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::BSplineDeformableTransform<float,3,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredAffineTransform<float,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredAffineTransform<float,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredEuler3DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::CenteredRigid2DTransform < float > >::RegisterTransform();
+- itk::TransformFactory<itk::CenteredSimilarity2DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Similarity2DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Euler2DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Euler3DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::FixedCenterOfRotationAffineTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::IdentityTransform<float,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::IdentityTransform<float,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::QuaternionRigidTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid2DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid3DPerspectiveTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::Rigid3DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScalableAffineTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleLogarithmicTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleSkewVersor3DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<float,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<float,2> >::RegisterTransform ();
+- itk::TransformFactory<itk::ScaleTransform<float,3> >::RegisterTransform ();
+- itk::TransformFactory<itk::TranslationTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::VersorRigid3DTransform<float> >::RegisterTransform ();
+- itk::TransformFactory<itk::VersorTransform<float> >::RegisterTransform ();
+- }
+Index: slicer-3.6.2~svn15375/Base/Logic/vtkSlicerTransformLogic.h
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Base/Logic/vtkSlicerTransformLogic.h 2010-10-30 21:19:37.407281588 -0400
++++ slicer-3.6.2~svn15375/Base/Logic/vtkSlicerTransformLogic.h 2010-10-30 21:19:38.000000000 -0400
+@@ -7,8 +7,8 @@
+
+ Program: 3D Slicer
+ Module: $RCSfile: vtkSlicerTransformLogic.h,v $
+- Date: $Date: 2010-07-01 17:27:45 -0400 (Thu, 01 Jul 2010) $
+- Version: $Revision: 14011 $
++ Date: $Date: 2010-02-15 21:35:35 +0000 (Mon, 15 Feb 2010) $
++ Version: $Revision: 12142 $
+
+ =========================================================================auto=*/
+
+@@ -43,10 +43,6 @@
+ /// Read transform from file
+ vtkMRMLTransformNode* AddTransform (const char* filename, vtkMRMLScene *scene);
+
+- // Register transform types with ITK factory
+- // TODO: revisit this after the next (3.20?) release of ITK is out!!!
+- void RegisterITKTransforms();
+-
+ ///
+ /// Write transform's data to a specified file
+ int SaveTransform (const char* filename, vtkMRMLTransformNode *transformNode);
+Index: slicer-3.6.2~svn15375/Base/GUI/vtkSlicerTransformsGUI.cxx
+===================================================================
+--- slicer-3.6.2~svn15375.orig/Base/GUI/vtkSlicerTransformsGUI.cxx 2010-10-30 21:19:37.363295197 -0400
++++ slicer-3.6.2~svn15375/Base/GUI/vtkSlicerTransformsGUI.cxx 2010-10-30 21:19:38.000000000 -0400
+@@ -20,11 +20,9 @@
+ #include "vtkKWLoadSaveDialog.h"
+ #include "vtkKWLoadSaveButton.h"
+
+-#include "vtkSmartPointer.h"
+-
+ //---------------------------------------------------------------------------
+ vtkStandardNewMacro (vtkSlicerTransformsGUI );
+-vtkCxxRevisionMacro ( vtkSlicerTransformsGUI, "$Revision: 14060 $");
++vtkCxxRevisionMacro ( vtkSlicerTransformsGUI, "$Revision: 13134 $");
+
+
+ //---------------------------------------------------------------------------
+@@ -38,15 +36,6 @@
+ NCIGTLabel = NULL;
+ BIRNLabel = NULL;
+
+- // Register transform types with ITK factory
+- // This code is from Applications/CLI/BRAINSTools/BRAINSCommonLib/GenericTransformImage.cxx
+- // We do this in order to register ScaleVersor3DTransform, which is not done
+- // in ITK 3.18. The rest of transforms need to be re-registered when a new
+- // transform is added. TODO: this must be revised in 3.20, hopefully
+- // ScaleVersor3DTransform will be out of Review by then
+- vtkSmartPointer<vtkSlicerTransformLogic> logic = vtkSmartPointer<vtkSlicerTransformLogic>::New();
+- logic->RegisterITKTransforms();
+-
+ }
+
+
More information about the debian-science-commits
mailing list