X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2FCMakeLists.txt;h=b48dc60b235155921aa6a3ba3c563f5c73132220;hb=de5fc413dc579fc61f7e04397efd1dc1087fe3cf;hp=c417bf4517db444dbc041faf8e1670dd91dc6ddc;hpb=e6054327de356b91d8e47d61e4c295536faed707;p=gdcm.git

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index c417bf45..b48dc60b 100644
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -134,26 +134,6 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
     ${EXE_DIR}/${CMAKE_CFG_INTDIR}/_gdcm${CMAKE_SHARED_LIBRARY_SUFFIX}
     )
 
-  # Remove temporary (lib)pygdcm(.so .dll) library:
-#  ADD_CUSTOM_COMMAND(
-#    TARGET pygdcm
-#    POST_BUILD
-#    COMMAND ${CMAKE_COMMAND}
-#    ARGS -E remove ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}
-#  )
-
-  # where are library stored ?
-#  SET(GDCM_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
-#  ADD_CUSTOM_COMMAND(
-#    TARGET pygdcm
-#    POST_BUILD
-#    COMMAND ${CMAKE_COMMAND}
-#    ARGS -E copy
-#      ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/${MY_LIB_NAME}${CMAKE_SHLIB_SUFFIX}
-#      ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/vtkXY.pvm
-#    TARGET vtkXY
-#  )
-
 ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
 
 
@@ -170,6 +150,7 @@ IF(GDCM_VTK)
 
   SET(vtkgdcmPython_la_SOURCES
       ${GDCM_SOURCE_DIR}/vtk/vtkGdcmReader.cxx
+      ${GDCM_SOURCE_DIR}/vtk/vtkGdcmWriter.cxx
   )
   SET_SOURCE_FILES_PROPERTIES(vtkGdcmReaderPython.cxx GENERATED)
   
@@ -195,12 +176,12 @@ ENDIF(GDCM_VTK)
 
 # generate a setup.py according to VTK installation
 # put it in subdir in order to not override old one
-
-GET_FILENAME_COMPONENT(VTKPATH ${VTK_DIR}/../../ ABSOLUTE)
-CONFIGURE_FILE(
-    ${GDCM_SOURCE_DIR}/gdcmPython/setup.py.in
-    ${GDCM_BINARY_DIR}/setup.py
-)
+#
+#GET_FILENAME_COMPONENT(VTKPATH ${VTK_DIR}/../../ ABSOLUTE)
+#CONFIGURE_FILE(
+#    ${GDCM_SOURCE_DIR}/gdcmPython/setup.py.in
+#    ${GDCM_BINARY_DIR}/setup.py
+#)
 
 #-----------------------------------------------------------------------------
 # Install stuff:
@@ -226,31 +207,23 @@ FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/__init__.py
     )
 
 FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/core.py
+    "from gdcmVersion import *\n"
     "import gdcm\n"
-    "GDCM_DATA_PATH     =\"${GDCM_DATA_ROOT}\"\n"
-    "GDCM_TEST_DATA_PATH=\"${GDCM_DATA_ROOT}\"\n"
+    "GDCM_DATA_ROOT = \"${GDCM_DATA_ROOT}\"\n"
     )
 
 IF(GDCM_VTK)
   FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/vtk.py
     "import os\n"
+    "from gdcmVersion import *\n"
     "if os.name == 'posix':\n"
     "  from libvtkgdcmPython import *\n"
     "else:\n"
     "  from vtkgdcmPython import *\n"
-    "GDCM_DATA_PATH     =\"${GDCM_DATA_ROOT}\"\n"
-    "GDCM_TEST_DATA_PATH=\"${GDCM_DATA_ROOT}\"\n"
+    "GDCM_DATA_ROOT = \"${GDCM_DATA_ROOT}\"\n"
     )
 ENDIF(GDCM_VTK)
 
-#-----------------------------------------------------------------------------
-# Copy the testSuite.py file
-CONFIGURE_FILE(
-    ${GDCM_SOURCE_DIR}/gdcmPython/testSuite.py
-    ${GDCM_BINARY_DIR}/gdcmPython/testSuite.py
-    COPYONLY
-)
-
 #-----------------------------------------------------------------------------
 # Add test from demo subdir: