[med-svn] r9402 - trunk/packages/gdcm/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Tue Jan 24 09:40:54 UTC 2012
Author: malat-guest
Date: 2012-01-24 09:40:54 +0000 (Tue, 24 Jan 2012)
New Revision: 9402
Added:
trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch
Modified:
trunk/packages/gdcm/trunk/debian/patches/series
Log:
Sync with upstream branch
Added: trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/activiz.net.patch 2012-01-24 09:40:54 UTC (rev 9402)
@@ -0,0 +1,729 @@
+Index: gdcm-2.2.0/Utilities/VTK/CMakeLists.txt
+===================================================================
+--- gdcm-2.2.0.orig/Utilities/VTK/CMakeLists.txt 2012-01-23 11:24:33.000000000 +0100
++++ gdcm-2.2.0/Utilities/VTK/CMakeLists.txt 2012-01-24 10:39:39.000000000 +0100
+@@ -126,28 +126,6 @@
+ #ENDIF(NOT VTK_BUILD_SHARED_LIBS AND GDCM_BUILD_SHARED_LIBS)
+
+ SET_TARGET_PROPERTIES(${VTKGDCM_NAME} PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
+-IF(GDCM_USE_ACTIVIZ AND UNIX)
+- # the following only works with Activiz VTK 5.4.2. The pure VTK lib are now shipped as separate libs.
+- # so one can safely link to them, instead of having to build a VTK by hand, link vtkgdcm to it
+- # and hope compiler configuration are compatible.
+- # if you use Activiz/VTK 5.2.1 you are on your own (see gdcm 2.0.12 which supports Activiz 5.2.1)
+- FIND_PACKAGE(ACTIVIZ REQUIRED)
+- #message(${ACTIVIZ_KITWARE_VTK_LIBRARY})
+- get_filename_component(bla ${ACTIVIZ_KITWARE_VTK_LIBRARY}
+- PATH)
+-
+- #LINK_DIRECTORIES(${bla})
+- #TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF
+- # ${bla}/libvtkCommon.so
+- # #${bla}/libvtkIO.so
+- # ${bla}/libvtkImaging.so
+- # ${bla}/libvtkRendering.so
+- # )
+- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF ${vtkgdcm_LIBS})
+-ELSE(GDCM_USE_ACTIVIZ AND UNIX)
+- TARGET_LINK_LIBRARIES(${VTKGDCM_NAME} gdcmMSFF ${vtkgdcm_LIBS})
+-ENDIF(GDCM_USE_ACTIVIZ AND UNIX)
+-
+ # prevent viral dep of vtkgdcm
+ SET_PROPERTY(TARGET ${VTKGDCM_NAME} PROPERTY LINK_INTERFACE_LIBRARIES "")
+ IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+@@ -182,10 +160,10 @@
+ MESSAGE(FATAL_ERROR "you need a newer VTK version >= 5.0")
+ ENDIF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" LESS 4.5 )
+
+-FIND_PACKAGE(PHP5 REQUIRED)
+-INCLUDE_DIRECTORIES(
+- ${PHP5_INCLUDE_PATH}
+-)
++ FIND_PACKAGE(PHP5 REQUIRED)
++ INCLUDE_DIRECTORIES(
++ ${PHP5_INCLUDE_PATH}
++ )
+
+ FIND_PACKAGE(SWIG REQUIRED)
+ MARK_AS_ADVANCED(SWIG_DIR SWIG_EXECUTABLE SWIG_VERSION)
+@@ -249,69 +227,346 @@
+ IF(GDCM_USE_ACTIVIZ)
+ FIND_PACKAGE(ACTIVIZ REQUIRED)
+ ELSE(GDCM_USE_ACTIVIZ)
+- MESSAGE("You are using the SWIG version of VTKGDCM. This is not compatible with Activiz")
++ MESSAGE(STATUS "You are using the SWIG version of VTKGDCM. This is not compatible with Activiz")
++ FIND_PACKAGE(SWIG REQUIRED)
++ MARK_AS_ADVANCED(SWIG_DIR SWIG_EXECUTABLE SWIG_VERSION)
++ INCLUDE(${SWIG_USE_FILE})
++ SET_SOURCE_FILES_PROPERTIES(vtkgdcm.i PROPERTIES CPLUSPLUS ON)
++ #SET_SOURCE_FILES_PROPERTIES(vtkgdcm.i PROPERTIES COMPILE_FLAGS -DUSEACTIVIZ)
+ ENDIF(GDCM_USE_ACTIVIZ)
+- FIND_PACKAGE(SWIG REQUIRED)
+- MARK_AS_ADVANCED(SWIG_DIR SWIG_EXECUTABLE SWIG_VERSION)
+- INCLUDE(${SWIG_USE_FILE})
+- SET_SOURCE_FILES_PROPERTIES(vtkgdcm.i PROPERTIES CPLUSPLUS ON)
+- #SET_SOURCE_FILES_PROPERTIES(vtkgdcm.i PROPERTIES COMPILE_FLAGS -DUSEACTIVIZ)
+ IF(GDCM_USE_ACTIVIZ)
+- SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue -DUSEACTIVIZ")
++ #SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue -DUSEACTIVIZ")
+ ELSE(GDCM_USE_ACTIVIZ)
+- SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue")
++ SET(CMAKE_SWIG_FLAGS "-namespace vtkgdcm -dllimport vtkgdcmsharpglue")
++ SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
++ SWIG_ADD_MODULE(vtkgdcmsharpglue csharp vtkgdcm.i)
++ SWIG_LINK_LIBRARIES(vtkgdcmsharpglue vtkgdcm)
++ # Stupid cmake-swig module is doing that for us, when not needed
++ IF(UNIX)
++ SET_TARGET_PROPERTIES(${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME} PROPERTIES PREFIX "lib")
++ ENDIF(UNIX)
++ IF(NOT GDCM_INSTALL_NO_LIBRARIES)
++ INSTALL(TARGETS ${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME}
++ EXPORT ${GDCM_TARGETS_NAME}
++ RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Applications
++ LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Libraries #${NAMELINK_SKIP}
++ ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
++ )
++ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+ ENDIF(GDCM_USE_ACTIVIZ)
+- SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
+- SWIG_ADD_MODULE(vtkgdcmsharpglue csharp vtkgdcm.i)
+- SWIG_LINK_LIBRARIES(vtkgdcmsharpglue vtkgdcm)
+- # Stupid cmake-swig module is doing that for us, when not needed
+- IF(UNIX)
+- SET_TARGET_PROPERTIES(${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME} PROPERTIES PREFIX "lib")
+- ENDIF(UNIX)
+
+-IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+- INSTALL(TARGETS ${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME}
+- EXPORT ${GDCM_TARGETS_NAME}
+- RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT Applications
+- LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Libraries #${NAMELINK_SKIP}
+- ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development
+- )
+-#if(NAMELINK_ONLY)
+-# INSTALL(TARGETS ${SWIG_MODULE_vtkgdcmsharpglue_REAL_NAME}
+-# LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT Development ${NAMELINK_ONLY}
+-# )
+-# endif(NAMELINK_ONLY)
+-
+-ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+- CONFIGURE_FILE(
+- ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in
+- ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
+- @ONLY)
+ CONFIGURE_FILE(
+ ${GDCM_SOURCE_DIR}/Wrapping/Csharp/key.snk
+ ${CMAKE_CURRENT_BINARY_DIR}/key.snk
+ COPYONLY)
++
+ IF(GDCM_USE_ACTIVIZ)
+- ADD_CUSTOM_COMMAND(
+- OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
+- COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/r:${ACTIVIZ_KITWARE_VTK_LIBRARY}" "/r:${ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY}" "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
+- #COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+- DEPENDS "${swig_generated_file_fullname}"
+- ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
+- COMMENT "csc *.cs"
+- )
++ FIND_PACKAGE(Mummy REQUIRED)
++ IF(NOT Mummy_BASE_DIR)
++ MESSAGE(FATAL_ERROR "error: Mummy_BASE_DIR not defined. Please set Mummy_DIR to the directory containing MummyConfig.cmake")
++ ENDIF(NOT Mummy_BASE_DIR)
++ INCLUDE("${Mummy_DIR}/MummyCMakeMacros.cmake")
++ IF(NOT mummy_EXECUTABLE)
++ FIND_PROGRAM(mummy_EXECUTABLE mummy)
++ ENDIF(NOT mummy_EXECUTABLE)
++ IF(NOT mummy_EXECUTABLE)
++ MESSAGE(FATAL_ERROR "error: mummy not found. mummy_EXECUTABLE='${mummy_EXECUTABLE}'")
++ ENDIF(NOT mummy_EXECUTABLE)
++
++ IF(NOT gccxml_EXECUTABLE)
++ FIND_PROGRAM(gccxml_EXECUTABLE gccxml)
++ ENDIF(NOT gccxml_EXECUTABLE)
++ IF(NOT gccxml_EXECUTABLE)
++ MESSAGE(FATAL_ERROR "error: gccxml not found. gccxml_EXECUTABLE='${gccxml_EXECUTABLE}'")
++ ENDIF(NOT gccxml_EXECUTABLE)
++ SET(gccxml_compiler "${CMAKE_CXX_COMPILER}")
++ IF(MSVC80)
++ SET(gccxml_compiler "msvc8")
++ ENDIF(MSVC80)
++ IF(MSVC90)
++ SET(gccxml_compiler "msvc9")
++ ENDIF(MSVC90)
++ #MESSAGE(STATUS "gccxml_compiler='${gccxml_compiler}'...")
++ SET(gccxml_include_args "")
++ FOREACH(dir ${Mummy_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS})
++ SET(gccxml_include_args ${gccxml_include_args} "-I${dir}")
++ ENDFOREACH(dir)
++ CONFIGURE_FILE(
++ "${CMAKE_CURRENT_SOURCE_DIR}/MummySettings.xml.in"
++ "${CMAKE_CURRENT_BINARY_DIR}/xml/MummySettings.xml"
++ @ONLY
++ )
++ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/csharp")
++ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/export-layer")
++
++ set(theclasslist
++ vtkGDCMImageReader
++ vtkGDCMImageWriter
++ vtkGDCMMedicalImageProperties
++ vtkGDCMPolyDataReader
++ vtkGDCMPolyDataWriter
++ vtkGDCMTesting
++ vtkGDCMThreadedImageReader
++ vtkGDCMThreadedImageReader2
++ vtkImageColorViewer
++ vtkImageMapToColors16
++ vtkImageMapToWindowLevelColors2
++ #vtkImagePlanarComponentsToComponents
++ vtkImageRGBToYBR
++ vtkImageYBRToRGB
++ vtkLookupTable16
++ vtkRTStructSetProperties
++ )
++ SET(kits gdcm)
++ # foreach kit
++ set(kit gdcm)
++ FOREACH(class ${theclasslist})
++ IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
++ #SET(header "${VTK_${ukit}_HEADER_DIR}/${class}.h")
++ SET(header "${CMAKE_CURRENT_SOURCE_DIR}/${class}.h")
++ SET(cxxclass "${class}")
++
++ # handle full paths
++ IF("${class}" MATCHES "^(\\/|.\\/|.\\\\|.:\\/|.:\\\\)")
++ SET(header "${class}.h")
++ STRING(REGEX MATCH "[^/]*$" cxxclass "${class}")
++
++ GET_FILENAME_COMPONENT(dir "${header}" PATH)
++ INCLUDE_DIRECTORIES("${dir}")
++ ENDIF("${class}" MATCHES "^(\\/|.\\/|.\\\\|.:\\/|.:\\\\)")
++
++ SET(abstract 0)
++ IF(VTK_CLASS_ABSTRACT_${class})
++ SET(abstract 1)
++ SET_SOURCE_FILES_PROPERTIES(${header} PROPERTIES ABSTRACT 1)
++ ENDIF(VTK_CLASS_ABSTRACT_${class})
++
++ # Build one master in-memory table so that we don't have to re-do all the
++ # logic in this nested FOREACH loop later on... Instead we'll simply iterate
++ # the in-memory table built here:
++ #
++ SET(WRAPPED_CLASS_TABLE ${WRAPPED_CLASS_TABLE} "${cxxclass} ${kit} ${abstract} ${header}")
++
++
++ SET(include_source_text "")
++ STRING(REGEX REPLACE "(.*).h" "\\1.cxx" source "${header}")
++ IF(EXISTS "${source}")
++ SET(include_source_text "#include \"${source}\"")
++ ELSE(EXISTS "${source}")
++ #MESSAGE(FATAL_ERROR "error: Source file '${source}' does not exist...")
++ ENDIF(EXISTS "${source}")
++
++ CONFIGURE_FILE(
++ "${CMAKE_CURRENT_SOURCE_DIR}/gccxml.cxx.in"
++ "${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx"
++ @ONLY
++ )
++
++ ADD_CUSTOM_COMMAND(
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
++ COMMAND ${gccxml_EXECUTABLE}
++ ARGS
++ -fxml=${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
++ -fxml-start=_cable_
++ ${gccxml_include_args} -DCABLE_CONFIGURATION
++ --gccxml-compiler ${gccxml_compiler}
++ ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
++ DEPENDS
++ ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}_gccxml.cxx
++ ${header}
++ ${gccxml_EXECUTABLE}
++ )
++
++#
++# *before* custom command re-arranging:
++#
++# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}.cs
++# ${CMAKE_CURRENT_BINARY_DIR}/export-layer/${cxxclass}EL.cxx
++#
++# Do not list the *.cs or *EL.cxx files as outputs of this custom command.
++# If you do, the custom command chains out into other targets rather than
++# being defined solely in the "generate wrappers" custom target.
++#
++# The output of this command is the generated sentinel file that the
++# "generate wrappers" target depends on. The other files are generated as an
++# intentional "side effect" and after the target is done building, the other
++# targets that build the generated source code may build... That is controlled
++# by target level dependencies to reduce complexity.
++#
++ ADD_CUSTOM_COMMAND(
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}-sentinel.txt
++ COMMAND ${mummy_EXECUTABLE}
++ --suppress-warnings 6005 6006 6009 6010 6012 6013 6015 6016 6017 6018 6019
++ --settings-file ${CMAKE_CURRENT_BINARY_DIR}/xml/MummySettings.xml
++ --gccxml-file ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
++ --csharp-file ${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}.cs
++ --export-layer-file ${CMAKE_CURRENT_BINARY_DIR}/export-layer/${cxxclass}EL.cxx
++ COMMAND ${CMAKE_COMMAND} -E touch
++ ${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}-sentinel.txt
++ DEPENDS
++ ${CMAKE_CURRENT_BINARY_DIR}/xml/${cxxclass}.xml
++ ${CMAKE_CURRENT_BINARY_DIR}/xml/MummySettings.xml
++ ${mummy_EXECUTABLE}
++ ${${cxxclass}_EXTRA_DEPENDENCIES}
++ )
++
++ SET(${kit}_EL_SOURCES ${${kit}_EL_SOURCES} "${CMAKE_CURRENT_BINARY_DIR}/export-layer/${cxxclass}EL.cxx")
++ SET(ALLKITS_EL_SOURCES ${ALLKITS_EL_SOURCES} "${CMAKE_CURRENT_BINARY_DIR}/export-layer/${cxxclass}EL.cxx")
++
++ SET(${kit}_CS_SOURCES ${${kit}_CS_SOURCES} "${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}.cs")
++ SET(ALLKITS_CS_SOURCES ${ALLKITS_CS_SOURCES} "${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}.cs")
++
++ SET(${kit}_SENTINELS ${${kit}_SENTINELS} "${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}-sentinel.txt")
++ SET(ALLKITS_SENTINELS ${ALLKITS_SENTINELS} "${CMAKE_CURRENT_BINARY_DIR}/csharp/${cxxclass}-sentinel.txt")
++ ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
++ ENDFOREACH(class)
++
++ ADD_CUSTOM_TARGET(
++ "vtk${kit}GenerateWrappers" ALL
++ DEPENDS ${${kit}_SENTINELS}
++ )
++ SET_SOURCE_FILES_PROPERTIES(
++ ${ALLKITS_EL_SOURCES}
++ ${ALLKITS_CS_SOURCES}
++ PROPERTIES GENERATED 1)
++
++ IF(VTK_BUILD_SHARED_LIBS)
++ SET(MV_ONE_EXPORT_LAYER_DLL 0)
++ ELSE(VTK_BUILD_SHARED_LIBS)
++ SET(MV_ONE_EXPORT_LAYER_DLL 1)
++ ENDIF(VTK_BUILD_SHARED_LIBS)
++
++ IF(MV_ONE_EXPORT_LAYER_DLL)
++ message(FATAL_ERROR "Unimplemented")
++ #SET(AVDN_INSTALL_TARGETS ${AVDN_INSTALL_TARGETS} "Kitware.VTK.Unmanaged")
++ #ADD_LIBRARY(Kitware.VTK.Unmanaged SHARED ${ALLKITS_EL_SOURCES})
++ #SET(unmanaged_targets ${unmanaged_targets} "Kitware.VTK.Unmanaged")
++ #SET(unmanaged_dlls ${unmanaged_dlls} "${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.VTK.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}")
++ #IF(WIN32)
++ # TARGET_LINK_LIBRARIES(Kitware.VTK.Unmanaged "${exe_dir}/Kitware.mummy.Runtime.Unmanaged.lib")
++ #ELSE(WIN32)
++ # TARGET_LINK_LIBRARIES(Kitware.VTK.Unmanaged "${exe_dir}/${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.mummy.Runtime.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}")
++ #ENDIF(WIN32)
++ ## TODO -- rename this CopyLibraries here too...
++ #ADD_DEPENDENCIES(Kitware.VTK.Unmanaged Kitware.mummy.CopyLibraries2)
++ #FOREACH(kit ${kits})
++ # TARGET_LINK_LIBRARIES(Kitware.VTK.Unmanaged vtk${kit})
++ # ADD_DEPENDENCIES(Kitware.VTK.Unmanaged "vtk${kit}GenerateWrappers")
++ #ENDFOREACH(kit)
++ ELSE(MV_ONE_EXPORT_LAYER_DLL)
++ INCLUDE_DIRECTORIES(${Mummy_INCLUDE_DIRS})
++ FOREACH(kit ${kits})
++ SET(AVDN_INSTALL_TARGETS ${AVDN_INSTALL_TARGETS} "Kitware.VTK.vtk${kit}.Unmanaged")
++ ADD_LIBRARY(Kitware.VTK.vtk${kit}.Unmanaged SHARED ${${kit}_EL_SOURCES})
++ SET(unmanaged_targets ${unmanaged_targets} "Kitware.VTK.vtk${kit}.Unmanaged")
++ SET(unmanaged_dlls ${unmanaged_dlls} "${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.VTK.vtk${kit}.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}")
++ IF(WIN32)
++ TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged "${exe_dir}/Kitware.mummy.Runtime.Unmanaged.lib")
++ ELSE(WIN32)
++ TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged ${Mummy_RUNTIME_LINK_LIBRARIES})
++ ENDIF(WIN32)
++ TARGET_LINK_LIBRARIES(Kitware.VTK.vtk${kit}.Unmanaged vtk${kit})
++ # TODO -- rename this CopyLibraries here too...
++ ADD_DEPENDENCIES(Kitware.VTK.vtk${kit}.Unmanaged Kitware.mummy.CopyLibraries2)
++ ADD_DEPENDENCIES(Kitware.VTK.vtk${kit}.Unmanaged "vtk${kit}GenerateWrappers")
++ ENDFOREACH(kit)
++ ENDIF(MV_ONE_EXPORT_LAYER_DLL)
++
++ set(csc_EXECUTABLE ${CMAKE_CSHARP_COMPILER})
++ # Set list of export-layer dlls in C# syntax as CMake variable
++ # MV_EXPORTLAYER_DLL_VARIABLES. This gets configured into
++ # WrappedObject.cs below.
++ #
++ SET(MV_EXPORTLAYER_DLL_VARIABLES "")
++ FOREACH(kit ${kits})
++ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} /// <summary>\n")
++ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} /// Export layer functions for 'vtk${kit}' are exported from\n")
++ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} /// the DLL named by the value of this variable.\n")
++ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} /// </summary>\n")
++
++ IF(MV_ONE_EXPORT_LAYER_DLL)
++ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} public const string vtk${kit}EL_dll = \"${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.VTK.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}\";\n")
++ ELSE(MV_ONE_EXPORT_LAYER_DLL)
++ SET(MV_EXPORTLAYER_DLL_VARIABLES "${MV_EXPORTLAYER_DLL_VARIABLES} public const string vtk${kit}EL_dll = \"${CMAKE_SHARED_LIBRARY_PREFIX}Kitware.VTK.vtk${kit}.Unmanaged${CMAKE_SHARED_LIBRARY_SUFFIX}\";\n")
++ ENDIF(MV_ONE_EXPORT_LAYER_DLL)
++ ENDFOREACH(kit)
++
++ SET(csharp_namespace "Kitware.VTK.GDCM")
++ CONFIGURE_FILE(
++ "${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in"
++ "${CMAKE_CURRENT_BINARY_DIR}/csharp/AssemblyInfo.cs"
++ @ONLY
++ )
++
++ SET(ALLKITS_CS_SOURCES
++ ${ALLKITS_CS_SOURCES}
++ "${CMAKE_CURRENT_BINARY_DIR}/csharp/AssemblyInfo.cs"
++ )
++
++ SET(AVDN_VTK_CSC_REFS ${ACTIVIZ_KITWARE_VTK_LIBRARY} ${ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY})
++ ADD_CSHARP_LIBRARY(
++ "Kitware.VTK.GDCM" # name of library
++ "${unmanaged_targets}" # list of CMake targets that need to build first
++ "${AVDN_VTK_CSC_REFS}" # list of csc "/reference:" args
++ "${unmanaged_dlls}" # list of csc "/linkresource:" args
++ "${AVDN_SNKEYFILE}" # strong name signing keyfile
++ # Source files:
++ ${ALLKITS_CS_SOURCES}
++ )
++
++ FOREACH(kit ${kits})
++ ADD_DEPENDENCIES(Kitware.VTK.GDCM "vtk${kit}GenerateWrappers")
++ ENDFOREACH(kit)
++
++ # ADD_CUSTOM_COMMAND(
++ # OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
++ # COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/r:${ACTIVIZ_KITWARE_VTK_LIBRARY}" "/r:${ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY}" "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
++ # #COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
++ # WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++ # DEPENDS "${swig_generated_file_fullname}"
++ # ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
++ # COMMENT "csc *.cs"
++ # )
++
++ INSTALL(FILES
++ ${GDCM_LIBRARY_DIR}/Kitware.VTK.GDCM.dll
++ ${GDCM_LIBRARY_DIR}/Kitware.VTK.GDCM.xml
++ DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKCSharpModule
++ )
++ INSTALL(TARGETS Kitware.VTK.vtk${kit}.Unmanaged
++ EXPORT ${GDCM_TARGETS_NAME}
++ RUNTIME DESTINATION ${GDCM_INSTALL_BIN_DIR} COMPONENT VTKLibraries
++ LIBRARY DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKLibraries #${NAMELINK_SKIP}
++ ARCHIVE DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKDevelopment
++ )
+ ELSE(GDCM_USE_ACTIVIZ)
+- ADD_CUSTOM_COMMAND(
+- OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
+- #COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/r:${ACTIVIZ_KITWARE_VTK_LIBRARY}" "/r:${ACTIVIZ_KITWARE_MUMMY_RUNTIME_LIBRARY}" "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
+- COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+- DEPENDS "${swig_generated_file_fullname}"
++ CONFIGURE_FILE(
++ ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyInfo.cs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
+- COMMENT "csc *.cs"
+- )
++ @ONLY)
+
++ ADD_CUSTOM_COMMAND(
++ OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
++ COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++ DEPENDS "${swig_generated_file_fullname}"
++ ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
++ COMMENT "csc *.cs"
++ )
++ ADD_CUSTOM_TARGET(VTKGDCMCSharp ALL
++ DEPENDS
++ ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
++ #${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll.config
++ #${GDCM_EXECUTABLE_DIR}/HelloWorld.exe
++ COMMENT "building vtkgdcm-sharp.dll"
++ )
++ # because vtkgdcm-sharp.dll is constructed with custom commands, it need the INSTALL(FILES signature:
++ SET(GDCM_LIBRARY_DIR2 ${LIBRARY_OUTPUT_PATH}/\${BUILD_TYPE})
++ INSTALL(FILES
++ ${GDCM_LIBRARY_DIR2}/vtkgdcm-sharp.dll
++ #${GDCM_LIBRARY_DIR2}/vtkgdcm-sharp.dll.config
++ DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKCSharpModule
++ )
+ ENDIF(GDCM_USE_ACTIVIZ)
+
+ #ADD_CUSTOM_COMMAND(
+@@ -321,22 +576,6 @@
+ # COMMENT "Copying vtkgdcm-sharp.dll.config"
+ #)
+
+-ADD_CUSTOM_TARGET(VTKGDCMCSharp ALL
+- DEPENDS
+- ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
+- #${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll.config
+- #${GDCM_EXECUTABLE_DIR}/HelloWorld.exe
+- COMMENT "building vtkgdcm-sharp.dll"
+-)
+-
+- # because vtkgdcm-sharp.dll is constructed with custom commands, it need the INSTALL(FILES signature:
+-SET(GDCM_LIBRARY_DIR2 ${LIBRARY_OUTPUT_PATH}/\${BUILD_TYPE})
+- INSTALL(FILES
+- ${GDCM_LIBRARY_DIR2}/vtkgdcm-sharp.dll
+- #${GDCM_LIBRARY_DIR2}/vtkgdcm-sharp.dll.config
+- DESTINATION ${GDCM_INSTALL_LIB_DIR} COMPONENT VTKCSharpModule
+- )
+-
+ ENDIF(GDCM_WRAP_CSHARP)
+
+ IF(GDCM_WRAP_JAVA)
+@@ -360,7 +599,7 @@
+ endif(EXISTS ${VTK_JAVA_JAR})
+ if(EXISTS /usr/lib/jni/libvtkCommonJava.so)
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=533198
+- message("Implicitely adding debian package layout...")
++ message(STATUS "Implicitely adding debian package layout...")
+ link_directories("/usr/lib/jni")
+ endif()
+ MARK_AS_ADVANCED(GDCM_VTK_JAVA_JAR)
+@@ -422,7 +661,7 @@
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+
+ ELSE(VTK_WRAP_JAVA)
+- MESSAGE("GDCM_WRAP_JAVA canot be build without VTK_WRAP_JAVA")
++ MESSAGE(STATUS "GDCM_WRAP_JAVA canot be build without VTK_WRAP_JAVA")
+ ENDIF(VTK_WRAP_JAVA)
+ ENDIF(GDCM_WRAP_JAVA)
+
+@@ -491,7 +730,7 @@
+ ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+
+ ELSE(VTK_WRAP_PYTHON)
+- MESSAGE("GDCM_WRAP_PYTHON canot be build without VTK_WRAP_PYTHON")
++ MESSAGE(STATUS "GDCM_WRAP_PYTHON canot be build without VTK_WRAP_PYTHON")
+ ENDIF(VTK_WRAP_PYTHON)
+ ENDIF(GDCM_WRAP_PYTHON)
+
+Index: gdcm-2.2.0/Utilities/VTK/CscArgs.txt.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gdcm-2.2.0/Utilities/VTK/CscArgs.txt.in 2012-01-24 10:39:39.000000000 +0100
+@@ -0,0 +1 @@
++ at CscArgs@
+Index: gdcm-2.2.0/Utilities/VTK/dllexportconf.cs
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gdcm-2.2.0/Utilities/VTK/dllexportconf.cs 2012-01-24 10:39:39.000000000 +0100
+@@ -0,0 +1 @@
++public const string vtkgdcmEL_dll = "libKitware.VTK.vtkgdcm.Unmanaged.so";
+Index: gdcm-2.2.0/Utilities/VTK/gccxml.cxx.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gdcm-2.2.0/Utilities/VTK/gccxml.cxx.in 2012-01-24 10:39:39.000000000 +0100
+@@ -0,0 +1,16 @@
++#include "@header@"
++
++#ifdef CABLE_CONFIGURATION
++namespace _cable_
++{
++ const char* const package = "Kitware.VTK.GDCM";
++ const char* const package_version = "@VTK_MAJOR_VERSION at .@VTK_MINOR_VERSION at .@VTK_BUILD_VERSION@";
++ const char* const group = "vtk at kit@";
++
++ namespace wrappers
++ {
++ typedef @cxxclass@ @cxxclass at _W;
++ }
++
++}
++#endif
+Index: gdcm-2.2.0/Utilities/VTK/MummySettings.xml.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gdcm-2.2.0/Utilities/VTK/MummySettings.xml.in 2012-01-24 10:39:39.000000000 +0100
+@@ -0,0 +1,196 @@
++<MummySettings>
++
++ <!-- Individual classes to exclude from wrapped layers -->
++ <!-- (These VTK classes are not included in the list of wrapped classes
++ that comes out of VTK's CMake info...) -->
++
++ <Class name="vtkAbstractContextBufferId" wrappable="false"/>
++ <Class name="vtkAMRBox" wrappable="false"/>
++ <Class name="vtkArrayCoordinates" wrappable="false"/>
++ <Class name="vtkArrayExtents" wrappable="false"/>
++ <Class name="vtkArrayRange" wrappable="false"/>
++ <Class name="vtkBoundingBox" wrappable="false"/>
++ <Class name="vtkCallbackCommand" wrappable="false"/>
++ <Class name="vtkColor3ub" wrappable="false"/>
++ <Class name="vtkColor4ub" wrappable="false"/>
++ <Class name="vtkContextKeyEvent" wrappable="false"/>
++ <Class name="vtkContextMouseEvent" wrappable="false"/>
++ <Class name="vtkContourRepresentationNode" wrappable="false"/>
++ <Class name="vtkEdgeType" wrappable="false"/>
++ <Class name="vtkExodusIICacheKey" wrappable="false"/>
++ <Class name="vtkImageComplex" wrappable="false"/>
++ <Class name="vtkImageConnectorSeed" wrappable="false"/>
++ <Class name="vtkIndent" wrappable="false"/>
++ <Class name="vtkInEdgeType" wrappable="false"/>
++ <Class name="vtkInterpolationInfo" wrappable="false"/>
++ <Class name="vtkInterpolationWeights" wrappable="false"/>
++ <Class name="vtkMultiProcessStream" wrappable="false"/>
++ <Class name="vtkOBBNode" wrappable="false"/>
++ <Class name="vtkOutEdgeType" wrappable="false"/>
++ <Class name="vtkProcessingUnitResource" wrappable="false"/>
++ <Class name="vtkPolygonalSurfacePointPlacerNode" wrappable="false"/>
++ <Class name="vtkRectf" wrappable="false"/>
++ <Class name="vtkRenderState" wrappable="false"/>
++ <Class name="vtkShader2" wrappable="false"/>
++ <Class name="vtkShader2Collection" wrappable="false"/>
++ <Class name="vtkShaderProgram2" wrappable="false"/>
++ <Class name="vtkShadowMapBakerPassLightCameras" wrappable="false"/>
++ <Class name="vtkShadowMapBakerPassTextures" wrappable="false"/>
++ <Class name="vtkStdString" wrappable="false"/>
++ <Class name="vtkTDxMotionEventInfo" wrappable="false"/>
++ <Class name="vtkTextureUnitManager" wrappable="false"/>
++ <Class name="vtkTIFFReaderInternal" wrappable="false"/>
++ <Class name="vtkTimeStamp" wrappable="false"/>
++ <Class name="vtkUnicodeString" wrappable="false"/>
++ <Class name="vtkVariant" wrappable="false"/>
++ <Class name="vtkVector2f" wrappable="false"/>
++ <Class name="vtkVector2i" wrappable="false"/>
++ <Class name="vtkVector3d" wrappable="false"/>
++ <Class name="vtkVolumeRayCastDynamicInfo" wrappable="false"/>
++ <Class name="vtkVolumeRayCastStaticInfo" wrappable="false"/>
++ at AVDN_EXTRA_EXCLUDE_CLASSES_XML@
++
++ <!-- Class patterns to exclude from wrapped layers -->
++
++ <ClassPattern pattern=".+<.+>" wrappable="false"/>
++ <ClassPattern pattern="vtk.*::" wrappable="false"/>
++
++
++ <!-- Individual classes to include in wrapped layers -->
++
++ <!-- vtkCommand: shadow="true" -->
++ <Class name="vtkCommand" wrappable="true"
++ defaultFactoryMethod="New"
++ defaultDisposalMethod="Delete"
++ shadow="true"
++ registerMethod="Register(null)"
++ unRegisterMethod="UnRegister(null)"
++ getRefCountMethod="GetReferenceCount()"
++ registerBaseClass="vtkObjectBase"
++ registerInclude="#include "vtkObjectBase.h""
++ wrappedObjectBase="WrappedObject"
++ beginExcludeRegex="^[\t ]*//BTX.*$"
++ endExcludeRegex="^[\t ]*//ETX.*$"
++ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
++ emitDefaultFactoryMethod="true"
++ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
++ />
++
++ <!-- vtkImageData: extra hand-crafted code -->
++ <Class name="vtkImageData" wrappable="true"
++ defaultFactoryMethod="New"
++ defaultDisposalMethod="Delete"
++ shadow="false"
++ extraExportLayerCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkImageDataEL_Extra.cxx"
++ extraCsharpCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkImageData_Extra.cs"
++ registerMethod="Register(null)"
++ unRegisterMethod="UnRegister(null)"
++ getRefCountMethod="GetReferenceCount()"
++ registerBaseClass="vtkObjectBase"
++ registerInclude="#include "vtkObjectBase.h""
++ wrappedObjectBase="WrappedObject"
++ beginExcludeRegex="^[\t ]*//BTX.*$"
++ endExcludeRegex="^[\t ]*//ETX.*$"
++ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
++ emitDefaultFactoryMethod="true"
++ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
++ />
++
++ <!-- vtkImplicitFunction: shadow="true" -->
++ <Class name="vtkImplicitFunction" wrappable="true"
++ defaultFactoryMethod="New"
++ defaultDisposalMethod="Delete"
++ shadow="true"
++ registerMethod="Register(null)"
++ unRegisterMethod="UnRegister(null)"
++ getRefCountMethod="GetReferenceCount()"
++ registerBaseClass="vtkObjectBase"
++ registerInclude="#include "vtkObjectBase.h""
++ wrappedObjectBase="WrappedObject"
++ beginExcludeRegex="^[\t ]*//BTX.*$"
++ endExcludeRegex="^[\t ]*//ETX.*$"
++ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
++ emitDefaultFactoryMethod="true"
++ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
++ />
++
++ <!-- vtkObject: extra hand-crafted code -->
++ <Class name="vtkObject" wrappable="true"
++ defaultFactoryMethod="New"
++ defaultDisposalMethod="Delete"
++ shadow="false"
++ extraExportLayerCode="@CMAKE_CURRENT_BINARY_DIR@/export-layer/vtkObjectEL_Extra.cxx"
++ extraCsharpCode="@CMAKE_CURRENT_BINARY_DIR@/csharp/vtkObject_Extra.cs"
++ registerMethod="Register(null)"
++ unRegisterMethod="UnRegister(null)"
++ getRefCountMethod="GetReferenceCount()"
++ registerBaseClass="vtkObjectBase"
++ registerInclude="#include "vtkObjectBase.h""
++ wrappedObjectBase="WrappedObject"
++ beginExcludeRegex="^[\t ]*//BTX.*$"
++ endExcludeRegex="^[\t ]*//ETX.*$"
++ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
++ emitDefaultFactoryMethod="true"
++ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
++ />
++
++ <!-- vtkProgrammableAttributeDataFilter: extra hand-crafted code -->
++ <Class name="vtkProgrammableAttributeDataFilter" wrappable="true"
++ defaultFactoryMethod="New"
++ defaultDisposalMethod="Delete"
++ shadow="false"
++ extraExportLayerCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkProgrammableAttributeDataFilterEL_Extra.cxx"
++ extraCsharpCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkProgrammableAttributeDataFilter_Extra.cs"
++ registerMethod="Register(null)"
++ unRegisterMethod="UnRegister(null)"
++ getRefCountMethod="GetReferenceCount()"
++ registerBaseClass="vtkObjectBase"
++ registerInclude="#include "vtkObjectBase.h""
++ wrappedObjectBase="WrappedObject"
++ beginExcludeRegex="^[\t ]*//BTX.*$"
++ endExcludeRegex="^[\t ]*//ETX.*$"
++ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
++ emitDefaultFactoryMethod="true"
++ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
++ />
++
++ <!-- vtkStringArray: extra hand-crafted code -->
++ <Class name="vtkStringArray" wrappable="true"
++ defaultFactoryMethod="New"
++ defaultDisposalMethod="Delete"
++ shadow="false"
++ extraExportLayerCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkStringArrayEL_Extra.cxx"
++ extraCsharpCode="@CMAKE_CURRENT_SOURCE_DIR@/vtkStringArray_Extra.cs"
++ registerMethod="Register(null)"
++ unRegisterMethod="UnRegister(null)"
++ getRefCountMethod="GetReferenceCount()"
++ registerBaseClass="vtkObjectBase"
++ registerInclude="#include "vtkObjectBase.h""
++ wrappedObjectBase="WrappedObject"
++ beginExcludeRegex="^[\t ]*//BTX.*$"
++ endExcludeRegex="^[\t ]*//ETX.*$"
++ countedMethodsRegex="^(CreateInstance|New|NewInstance)$"
++ emitDefaultFactoryMethod="true"
++ externalHints="@AVDN_VTK_SOURCE_DIR@/Wrapping/hints"
++ />
++
++ <!-- Class patterns to include in wrapped layers -->
++ <ClassPattern pattern="^vtk" wrappable="true"
++ defaultFactoryMethod="New"
++ defaultDisposalMethod="Delete"
++ extraCsharpCode="@CMAKE_CURRENT_SOURCE_DIR@/dllexportconf.cs"
++ shadow="false"
++ registerMethod="Register(null)"
++ unRegisterMethod="UnRegister(null)"
++ getRefCountMethod="GetReferenceCount()"
++ registerBaseClass="vtkObjectBase"
++ registerInclude="#include "vtkObjectBase.h""
++ wrappedObjectBase="WrappedObject"
++ beginExcludeRegex="^[\t ]*//BTX.*$"
++ endExcludeRegex="^[\t ]*//ETX.*$"
++ countedMethodsRegex="^(CreateImageReader2|CreateInstance|MakeTransform|New|NewInstance)$"
++ emitDefaultFactoryMethod="true"
++ externalHints="@VTK_WRAP_HINTS@"
++ />
++
++</MummySettings>
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2012-01-24 07:46:00 UTC (rev 9401)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2012-01-24 09:40:54 UTC (rev 9402)
@@ -4,3 +4,4 @@
fixgcj2.patch
doxygen_svg.patch
stableapi.patch
+activiz.net.patch
More information about the debian-med-commit
mailing list